-
Brendan Kochunas authored
Squashed commit of the following: commit 75790658d2692dac3f03f5266baf9cc1543f901c Author: Brendan Kochunas <bkochuna@umich.edu> Date: Wed Oct 30 11:32:26 2013 -0400 Adding local variables to Driver for when HAVE_MPACT_LATTICE is defined. Needed to build. Code compiled by HAVE_MPACT_LATTICE is not functional. commit 7947be2735f7bcfc0a2fd789a4d168dfcc5a4526 Author: Brendan Kochunas <bkochuna@umich.edu> Date: Wed Oct 30 11:31:44 2013 -0400 Commenting out unit tests for Lattice subpackage. commit 28de2101325c382351543f9154fd31c7caa42b1a Author: Brendan Kochunas <bkochuna@umich.edu> Date: Wed Oct 30 11:31:12 2013 -0400 Fix-up for unresolved external symbol in LatticeSolver. commit 912e505ccfb95f67235c6bebaaec88ac39e3dcee Author: Brendan Kochunas <bkochuna@umich.edu> Date: Wed Oct 30 11:01:31 2013 -0400 Fix ups to Lattice subpackage for refactor. Builds now. commit 0b4b2907393435915f42fa4321944417ac2463ce Author: Dan Jabaay <djabaay@umich.edu> Date: Wed Oct 30 11:33:07 2013 -0400 Fixing Tests. commit 7472eabbda99a284a967fd2c8bc909f9d77a6b14 Author: Dan Jabaay <djabaay@umich.edu> Date: Tue Oct 29 16:38:53 2013 -0400 Fixing some naming convention issues. Realized that the actual main parameter list in the XML setup is CASEID, not CASE. Did lots of find replacing. Also fixed a file name bug that was happening in XML. commit b6553600f6b2bc8cd9f20fcffeb9bec1670f5b65 Author: Dan Jabaay <djabaay@umich.edu> Date: Tue Oct 29 15:19:54 2013 -0400 Adding some necessary defaults for the parameter list values for XSShielder and core power. commit 68c8c01562413b811426ffd5217fbd9c27f71471 Author: Dan Jabaay <djabaay@umich.edu> Date: Tue Oct 29 15:19:11 2013 -0400 Fixing some bad merges from Edits and some bugs in Driver. commit 097ea0ea1683694033e8a1a8ffcf02d34e2ccbae Author: Dan Jabaay <djabaay@umich.edu> Date: Mon Oct 28 16:43:25 2013 -0400 remaking some mods to edits. commit 80b43926e8544f00b43536c6b41fb2b917ff0c2f Author: Dan Jabaay <djabaay@umich.edu> Date: Mon Oct 28 16:09:51 2013 -0400 Fixing some of the Parameter List issues. Need to pass in a physical TYPE, not a CLASS POINTER. commit d258c8c3c22888ccb6bb26bb9449e2ebd744844d Author: Dan Jabaay <djabaay@umich.edu> Date: Mon Oct 28 14:02:54 2013 -0400 Added the SetupMaterials and SetupGeom in Driver. Added routines in MaterialTypes to convert input atom or weight percents to number densities. commit aa1ccd535ff25c520ce0483b068c993f84edf3da Author: Dan Jabaay <djabaay@umich.edu> Date: Mon Oct 28 14:02:05 2013 -0400 Updating the XMLProc to setup the coregeom meshing parameter lists and a few bug fixes. Adjusted how some of the enrichment data for materials is stored before it is converted. commit 3a87ffcc7da6cf8a6f7dc617a91de67354689411 Author: Dan Jabaay <djabaay@umich.edu> Date: Mon Oct 28 11:07:10 2013 -0400 Added some array functions for io_strings to check if a pattern exists in an array of string types, and also to determine the index in the array if the pattern does exist. Added them to the unit test. commit 4e491935ccd6f8606276dcaca0f3e52e9c64aaff Author: Dan Jabaay <djabaay@umich.edu> Date: Mon Oct 28 10:51:21 2013 -0400 Added an optional argument for the ANY and ALL functional overloads for the .NOT. option to be used inside the evaluation instead of at the end of the operation. Added more tests. commit 199c3ce0b676488db921f9a9522cd248a24bffb3 Author: Dan Jabaay <djabaay@umich.edu> Date: Fri Oct 25 14:10:51 2013 -0400 Updated the stringtype to overload the ANY and ALL intrinsic operations. Only works on 1-D arrays for now, but can be easily extended. Unit tested and passing. commit 9e78e72c915d065eeaadc89c2b57d68e7c7d66f4 Author: Dan Jabaay <djabaay@umich.edu> Date: Fri Oct 25 10:40:29 2013 -0400 Updated Driver and Edits to have module variables for the varibles that were once stored in modules. These variables get set by mpactParams. The code compiles. commit 843b1c3a913411755f226e7ab6ec780d3db1566f Author: Dan Jabaay <djabaay@umich.edu> Date: Thu Oct 24 16:46:23 2013 -0400 Updated the input proc test so it verifies the parameter lists from the scan and read portions. In the process of updating Driver. commit 7602f6e3bd588b26d937274ed28d9e96d1ef8a4f Author: Dan Jabaay <djabaay@umich.edu> Date: Thu Oct 24 10:31:44 2013 -0400 Fixing up a few things from the rebase. Adding the UnitTest harness calls to the Parameter list test. commit 8d6f8273ac4df243c82af2ba463d44e72f6c2d3d Author: Dan Jabaay <djabaay@umich.edu> Date: Thu Oct 24 09:41:46 2013 -0400 Minor changes to driver. Deleted lots of the USE *Var modules. Some minor changes to the helper. commit 70e037c531222467017334d09ecffb1d24a4c78b Author: Dan Jabaay <djabaay@umich.edu> Date: Wed Oct 23 16:17:24 2013 -0400 More Checks. commit 652f796379578bba812123274f289fd521db0c33 Author: Dan Jabaay <djabaay@umich.edu> Date: Wed Oct 23 16:12:37 2013 -0400 Added a few more error checks to the XMLProc. commit 9d1fd0cc188b31348129f6d0f2efefea9198c8a3 Author: Dan Jabaay <djabaay@umich.edu> Date: Wed Oct 23 14:59:17 2013 -0400 Updated the last bit of XMLProc and the test. The test now checks the ScanXML and the SetupXML successfully thus far. Maybe a bit more work left to put in some input checks into XMLProc. commit 452e9077539caf73cf067cfcf20008985f0018f3 Author: Dan Jabaay <djabaay@umich.edu> Date: Wed Oct 23 14:58:42 2013 -0400 Updated some of the FINFO() edits in the match_ routine. Added a revision note. commit 6316162c6b26e1702fe06825b22ff52e098791d7 Author: Dan Jabaay <djabaay@umich.edu> Date: Wed Oct 23 12:24:51 2013 -0400 Adding SIZE checks and assertions for all of the array parameters so we don't get runtime errors from the ALL() operator. commit 1c418d4019c45419c4e786ef9643c72868f97bdc Author: Dan Jabaay <djabaay@umich.edu> Date: Tue Oct 22 16:12:36 2013 -0400 Completing the ScanXML test. Moving onto the SetupXML portion. commit 0a8d2d63326efab1ca5e2e26a3c2e8520b960648 Author: Dan Jabaay <djabaay@umich.edu> Date: Tue Oct 22 16:11:19 2013 -0400 Put the finishing touches on the %verify subroutine. Failure info is now printed, reduced the number of logical checks in the match_ function. Added a simple check to the unit test where the parameter list is verified against itself. commit 8885e9621bf3d071220d604061c697e0eb87969b Author: Dan Jabaay <djabaay@umich.edu> Date: Mon Oct 21 16:45:41 2013 -0400 Alphabetized the PL's in the test. This is how they will be generated by the conversion script from the VERA input. commit 568e38815ad2ac2fd91f748fc31c821519f3d93a Author: Dan Jabaay <djabaay@umich.edu> Date: Mon Oct 21 16:41:41 2013 -0400 Made the "Match" routine that was with validate into it's own routine called "verify". The routine is type bound, will do all that validate does, and in addition, will check the contents of the PL's. The intent of this routine is for unit tests where PL will be compared. This will save time explicitly coding in PL structure checks by hand, because the %verify routine uses the UnitTest Harness ASSERT calls. commit 3f0074c29627865473847af0d0bbf3f01fe76c8b Author: Dan Jabaay <djabaay@umich.edu> Date: Mon Oct 21 15:56:46 2013 -0400 Adding routines for the parameter list validate to go one step further and actually compare the values of the parameter lists being validated. It is called "match" at this point, is an optional input argument into the %validate routine. Added one token check into the unit test to try to cover something. commit 46f06404d19e9d096b5ace7dbf653a4793d4e904 Author: Dan Jabaay <djabaay@umich.edu> Date: Fri Oct 18 13:27:33 2013 -0400 Updated the ScanMat to just copy over the XML PL to MPACT PL. Moved any data manipulation from that routine into setupMats(). Also modified the setMatKeys routines for UO2 to use the newly arranged data/parameter list. commit 9fad0dd4358858442e722a29d24fba577adc0271 Author: Dan Jabaay <djabaay@umich.edu> Date: Thu Oct 17 10:36:18 2013 -0400 Committing the XMLProc refactor. Currently sets up the structure that the standard input sets up, test is commented out for now. commit 76188c9501dbc7bc50be01946e3a44632f1b2b74 Author: Dan Jabaay <djabaay@umich.edu> Date: Mon Oct 14 09:35:39 2013 -0400 Incomplete commit for the UnitTest Helper geometry setup. commit b106d46f43eb5d0386140686cea40ba348868084 Author: Brendan Kochunas <bkochuna@umich.edu> Date: Thu Oct 10 16:47:55 2013 -0400 Updated non-PS code for changes to SurfaceIndexing. commit e52562ad99eefb6566047d0e1a86970644dcc989 Author: Brendan Kochunas <bkochuna@umich.edu> Date: Thu Oct 10 15:54:36 2013 -0400 Refactored more of InputProc. The echo status of the input file now works as originally designed. commit 28ad016d8a0051134744cb36b234b087c25b045c Author: Brendan Kochunas <bkochuna@umich.edu> Date: Thu Oct 10 15:51:05 2013 -0400 Bug fix to ProcBlock_CASEID when performing a backspace of the echo unit this should only be done if the input set to echo to output. commit e0bdf2476c8bdc0527d0d3d6bc7ca0d57ee8d02c Author: Brendan Kochunas <bkochuna@umich.edu> Date: Thu Oct 10 13:44:28 2013 -0400 Fixed up a few bugs in InputProc. Also modified a few ProcBlock scan routines to define a parameter list with their block name. testInputProc is partially refactored. Everything that was there is disabled. New assertions need to be added next. commit 528cf3f3ce5ca06ebe4dbe3e6814af59fcc8548c Author: Brendan Kochunas <bkochuna@umich.edu> Date: Thu Oct 10 13:42:35 2013 -0400 Removed fixed length name from TimerType. Updated test and dependent code. Also refactored testTimes to use the new Unit Test harness. commit 3797a43274f0572b438c8326f34aa6942aab4a94 Author: Brendan Kochunas <bkochuna@umich.edu> Date: Wed Oct 9 17:08:33 2013 -0400 Finished refactor of native text input block processors. Updated testProcBlocks. commit 0444016ebc5ebc0b768944b88b377d1d1e09f31a Author: Brendan Kochunas <bkochuna@umich.edu> Date: Wed Oct 9 17:06:50 2013 -0400 Fixed bug in processing Explicit Partition file. This could get stuck in an infinite loop. commit 68563509e8ca6f356ecf200c0e6ef01b43465d5a Author: Brendan Kochunas <bkochuna@umich.edu> Date: Tue Oct 8 16:21:00 2013 -0400 Removed OptionVar.f90 module and file. commit 0156a691c8ae685ea3af34b37a2bb9c81ac29ba4 Author: Brendan Kochunas <bkochuna@umich.edu> Date: Tue Oct 8 16:16:59 2013 -0400 Refactored ProcBlock_OPTION to generate a parameter list and updated test. commit b32fe2253a17bbe2f45335251b44bf58b49d96ab Author: Brendan Kochunas <bkochuna@umich.edu> Date: Tue Oct 8 16:13:25 2013 -0400 Fixing unit tests dependent upong B.C. enumerations. commit c8692a95b6d6e6bee2b642d1b93e402af57a4a8f Author: Brendan Kochunas <bkochuna@umich.edu> Date: Tue Oct 8 16:12:01 2013 -0400 Minor changes to XSTransportCorrection to module parameters for names of scattering corrections and enumerations. commit 2b2b208830690fb40b1b7dd83979f33671810590 Author: Brendan Kochunas <bkochuna@umich.edu> Date: Tue Oct 8 16:10:49 2013 -0400 Moved definition of B.C. enumerations to SurfaceIndexing and out of ModularMesh and CMFD. commit 55bcd24870201bb8afa2da7a2d2c9f0db936e10d Author: Brendan Kochunas <bkochuna@umich.edu> Date: Mon Oct 7 12:29:42 2013 -0400 Removed DeplVar and EditVar. These are no longer needed. Refactored ProcBlock_DEPL and testProckBlocks. commit 88f30f73ad44f863dabc19a6b6c2aebe3bdca9b3 Author: Brendan Kochunas <bkochuna@umich.edu> Date: Mon Oct 7 12:27:40 2013 -0400 Cleaned up some module dependencies and comments. In the ProcBlock modules. commit c829015deb88d5885d2ab96ebd2618b47e5828b9 Author: Brendan Kochunas <bkochuna@umich.edu> Date: Fri Oct 4 15:22:23 2013 -0400 Forgot to add this in previous commit. Removed ClearEdit from ProcBlocks because this procedure no longer exists. commit 76cc8a679269feb16c4fa8e1220ef4a4601d32cc Author: Brendan Kochunas <bkochuna@umich.edu> Date: Fri Oct 4 15:21:21 2013 -0400 Refactored EDIT block and test. Also updated some of InputProc. Forgot to commit that earlier. commit 0242d735eaa6a4d471ee0b650e7557fde7c4eb5d Author: Brendan Kochunas <bkochuna@umich.edu> Date: Fri Oct 4 13:50:12 2013 -0400 Removing deprecated modules from XMLProc so it builds. commit e9e44c19776423ccb0f234b630397f02ce520131 Author: Brendan Kochunas <bkochuna@umich.edu> Date: Fri Oct 4 13:49:07 2013 -0400 Finished refactoring MATERIAL block. Error checking and rules for material card have changed slightly, and in general are much improved. commit fafbd570f44ad1133f7bad776c9a5a0f4e430ca1 Author: Brendan Kochunas <bkochuna@umich.edu> Date: Thu Oct 3 09:32:42 2013 -0400 Updated ProcBlock_MATERIAL to only setup a parameter list. MATERIAL block subtest in testProcBlocks is partially complete. commit 2c6e862c16777983c4b0fa7ad6c9be6df7eaf90f Author: Brendan Kochunas <bkochuna@umich.edu> Date: Tue Oct 1 15:38:13 2013 -0400 Refactored XSEC block processor and updated testProcBlocks. commit 87b27628e9653d8965be4cfcbb29f1361af94507 Author: Brendan Kochunas <bkochuna@umich.edu> Date: Tue Oct 1 15:34:00 2013 -0400 Removed some unused variables and updated some comments. commit 86819841950a0c99e9c37fe130282adeb0c72e83 Author: Brendan Kochunas <bkochuna@umich.edu> Date: Tue Oct 1 15:23:16 2013 -0400 Cleaned up some of Strings. Don't need to use if blocks for whether or not optional arguments are present when passing them as optional arguments. commit e24bdba0359275d425f6321755f69991b808bc3a Author: Brendan Kochunas <bkochuna@umich.edu> Date: Mon Sep 30 15:59:49 2013 -0400 Overloaded strrep so that the string can be either a character array type or a string type. commit df43682ef710b6668ba5e7708c11cf4e7b4f788d Author: Brendan Kochunas <bkochuna@umich.edu> Date: Mon Sep 30 14:54:13 2013 -0400 Removed StateVar.f90 variable module. commit 5c4298170848c1d75a7ba357947c6cf97be67557 Author: Brendan Kochunas <bkochuna@umich.edu> Date: Mon Sep 30 14:41:31 2013 -0400 Updated comments and use statements. commit 77e5bac986ea5263aa07f4ac1b8be294a903a758 Author: Brendan Kochunas <bkochuna@umich.edu> Date: Mon Sep 30 14:32:32 2013 -0400 Updated ProcBlock_STATE to set a parameter list rather than module variables. Updated test and InputProc. Also renamed cards in STATE block. commit 9e3ad55925cf4ded0f54abb933d03f7c2d4d8996 Author: Brendan Kochunas <bkochuna@umich.edu> Date: Mon Sep 30 14:29:31 2013 -0400 Minor fixes to ProcBlock_CASEID. Typo/bug and removed unused variables. commit c0bea40c1091d121f84a0263a3c83f07195d822f Author: Brendan Kochunas <bkochuna@umich.edu> Date: Mon Sep 30 13:54:10 2013 -0400 Renamed mpactInputParams to mpactParams since it contains simulation and executable metadata. Updated InputProc and ProcBlock_CASEID and testProcBlocks to use the new parameter list based input features. commit faa90b814aae90fee414b158701cdf671fe4023d Author: Brendan Kochunas <bkochuna@umich.edu> Date: Sat Sep 28 17:32:54 2013 -0400 Minor fix to GET_CURRENT_DIRECTORY. Removed C_NULL_CHAR. Also overloaded toUPPER for StringType. commit ef6c0d3438a1f94e7c3ef93d52a8ad93de28623b Author: Brendan Kochunas <bkochuna@umich.edu> Date: Sat Sep 28 15:11:59 2013 -0400 Moved overloaded GET_* routines to IOUtil and took them out of IO_Strings. Also added a GET_CURRENT_DIRECTORY routine. Updated testIOutil. commit 2714e8f8b30a31a144a51ce22a882690be75bc65 Author: Brendan Kochunas <bkochuna@umich.edu> Date: Sat Sep 28 15:10:26 2013 -0400 Renamed getPWD to getPWD_c commit de1e424f160bf9ff915a83463492f5f079d80e95 Author: Brendan Kochunas <bkochuna@umich.edu> Date: Sat Sep 28 13:59:33 2013 -0400 Extended getCmdArg interface on the command line processor type to return either a character array or a string type. Updated unit test. commit 7745089480eb07b2b20f0d7b17a5850c86f0a314 Author: Brendan Kochunas <bkochuna@umich.edu> Date: Fri Sep 27 17:29:12 2013 -0400 Updated the command line processor to store its attributes as strings rather than character arrays. This eliminates the parameters for fixed length character arrays. Refactored unit test as well. commit 90260b79790422e019cba5206323ffd6226ea92b Author: Brendan Kochunas <bkochuna@umich.edu> Date: Fri Sep 27 16:37:44 2013 -0400 Overloaded nFields and getField to work with StringTypes. Updated testIOutil. commit 8046512fc657af6601fe4440ddc140ea2d2017e1 Author: Brendan Kochunas <bkochuna@umich.edu> Date: Fri Sep 27 15:46:56 2013 -0400 Added overloaded GET_COMMAND subroutine that returns a StringType. commit 6786a1930a925b2f5b1356386f68c399c6bc9086 Author: Brendan Kochunas <bkochuna@umich.edu> Date: Fri Sep 27 14:22:39 2013 -0400 Renamed files in CUtils. Updated CMakeLists and added routine to return the present working directory. commit 789284ae8e631985214c63e43622438eb97d8b79 Author: Brendan Kochunas <bkochuna@umich.edu> Date: Thu Sep 26 17:10:23 2013 -0400 Fixed typo in module name for InputVar. Whoops. commit aa1b93b2e6451232ffd914d62f4de0f1f7716c66 Author: Brendan Kochunas <bkochuna@umich.edu> Date: Thu Sep 26 17:09:06 2013 -0400 Added an overloaded procedure for GET_ENVIRONMENT_VARIABLE that returns a string for the value so one doesn't need to worry about having a character array of sufficient size. Refactored testIOUtil in the process. commit 045af5d8757384e9cc14376b1d4d66841ed08bae Author: Brendan Kochunas <bkochuna@umich.edu> Date: Thu Sep 26 11:39:28 2013 -0400 Adding new data module to UI for global parameter list for MPACT simulation.
6b6f4a97