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 5c82aea6c37f..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 @@ -183,7 +183,9 @@ struct spmv_tpl_spec_avail, int, int, Kokkos::LayoutRight, Kokkos::LayoutRight, Kokkos::CudaUVMSpace) #endif -#if (10010 <= CUDA_VERSION) +//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. @@ -300,8 +302,8 @@ struct spmv_tpl_spec_avail, int64_t, size_t, Kokkos::LayoutRight, Kokkos::LayoutRight, Kokkos::CudaUVMSpace) #endif -#endif // CUSPARSE >= 10.0 (nested, implies >= 9.0) -#endif // CUSPARSE >= 9.0? +#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 diff --git a/packages/kokkos-kernels/src/impl/tpls/KokkosSparse_spmv_tpl_spec_decl.hpp b/packages/kokkos-kernels/src/impl/tpls/KokkosSparse_spmv_tpl_spec_decl.hpp index ff2ed13ab0e0..e9596fb772f4 100644 --- a/packages/kokkos-kernels/src/impl/tpls/KokkosSparse_spmv_tpl_spec_decl.hpp +++ b/packages/kokkos-kernels/src/impl/tpls/KokkosSparse_spmv_tpl_spec_decl.hpp @@ -88,7 +88,7 @@ namespace Impl { if(mode[0] == Transpose[0]) {myCusparseOperation = CUSPARSE_OPERATION_TRANSPOSE;} else if(mode[0] == ConjugateTranspose[0]) {myCusparseOperation = CUSPARSE_OPERATION_CONJUGATE_TRANSPOSE;} -#if defined(CUDA_VERSION) && (10010 <= CUDA_VERSION) +#if defined(CUSPARSE_VERSION) && (10300 <= CUSPARSE_VERSION) /* Check that cusparse can handle the types of the input Kokkos::CrsMatrix */ cusparseIndexType_t myCusparseOffsetType; @@ -270,7 +270,7 @@ namespace Impl { 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 (10010 <= CUDA_VERSION) +#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) 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/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.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 2668d9047469..3bb42a1e6409 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.C +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.C @@ -867,12 +867,12 @@ void Iocgns::Utils::output_assembly(int file_ptr, const Ioss::Assembly *assembly // Now, iterate the members of the assembly and add the reference to the structured block if (assembly->get_member_type() == Ioss::STRUCTUREDBLOCK) { for (const auto &mem : members) { - int sbbase = mem->get_property("base").get_int(); + int base = mem->get_property("base").get_int(); const auto *sb = dynamic_cast(mem); Ioss::Utils::check_dynamic_cast(sb); if (is_parallel_io || sb->is_active()) { int db_zone = get_db_zone(sb); - if (cg_goto(file_ptr, sbbase, "Zone_t", db_zone, "end") == CG_OK) { + if (cg_goto(file_ptr, base, "Zone_t", db_zone, "end") == CG_OK) { CGERR(cg_famname_write(assembly->name().c_str())); } } 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/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 9fa7ecfeddfa..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 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 74c977b06195..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,11 +1169,11 @@ 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()); } } } @@ -1181,7 +1181,7 @@ namespace { #endif #if defined(SEACAS_HAVE_EXODUS) - void update_exodus_assembly_info(Ioss::Region ®ion, const Modify::Interface &interFace) + void update_exodus_assembly_info(Ioss::Region ®ion, const Modify::Interface &interFace) { std::vector ex_assemblies; bool modify_existing = false; @@ -1261,11 +1261,12 @@ namespace { 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/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.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/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