Skip to content

Commit

Permalink
got rid of endout
Browse files Browse the repository at this point in the history
  • Loading branch information
@ameliajo
ameliajo committed Sep 1, 2019
1 parent 1acaa48 commit c8bdc4c
Show file tree
Hide file tree
Showing 13 changed files with 45 additions and 949 deletions.
54 changes: 24 additions & 30 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,18 @@ set( leapr_AppleClang_Darwin_link_time_optimization_flags "-flto" )
set( leapr_AppleClang_Darwin_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
set( leapr_AppleClang_Darwin_nonportable_optimization_flags "-march=native" )
set( leapr_AppleClang_Darwin_static_flags "-static" )
set( leapr_GNU_Windows_common_flags "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" )
set( leapr_GNU_Windows_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" )
set( leapr_GNU_Windows_RELEASE_flags "-O3" "-DNDEBUG" )
set( leapr_GNU_Windows_strict_flags "-Werror" )
set( leapr_GNU_Windows_coverage_flags "--coverage" )
set( leapr_GNU_Windows_subproject_flags )
set( leapr_GNU_Windows_base_project_flags )
set( leapr_GNU_Windows_profile_generate_flags "-fprofile-generate='${CMAKE_BINARY_DIR}/profiling'" )
set( leapr_GNU_Windows_link_time_optimization_flags "-flto" )
set( leapr_GNU_Windows_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
set( leapr_GNU_Windows_nonportable_optimization_flags "-march=native" )
set( leapr_GNU_Windows_static_flags "-static" )
set( leapr_GNU_Darwin_common_flags "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" )
set( leapr_GNU_Darwin_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" )
set( leapr_GNU_Darwin_RELEASE_flags "-O3" "-DNDEBUG" )
Expand All @@ -106,18 +118,18 @@ set( leapr_GNU_Linux_link_time_optimization_flags "-flto" )
set( leapr_GNU_Linux_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
set( leapr_GNU_Linux_nonportable_optimization_flags "-march=native" )
set( leapr_GNU_Linux_static_flags "-static" )
set( leapr_GNU_Windows_common_flags "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" )
set( leapr_GNU_Windows_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" )
set( leapr_GNU_Windows_RELEASE_flags "-O3" "-DNDEBUG" )
set( leapr_GNU_Windows_strict_flags "-Werror" )
set( leapr_GNU_Windows_coverage_flags "--coverage" )
set( leapr_GNU_Windows_subproject_flags )
set( leapr_GNU_Windows_base_project_flags )
set( leapr_GNU_Windows_profile_generate_flags "-fprofile-generate='${CMAKE_BINARY_DIR}/profiling'" )
set( leapr_GNU_Windows_link_time_optimization_flags "-flto" )
set( leapr_GNU_Windows_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
set( leapr_GNU_Windows_nonportable_optimization_flags "-march=native" )
set( leapr_GNU_Windows_static_flags "-static" )
set( leapr_Clang_Windows_common_flags "-stdlib=libc++" "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" )
set( leapr_Clang_Windows_DEBUG_flags "-O0" "-g" "-gdwarf-3" )
set( leapr_Clang_Windows_RELEASE_flags "-O3" "-DNDEBUG" )
set( leapr_Clang_Windows_strict_flags "-Werror" )
set( leapr_Clang_Windows_coverage_flags "--coverage" )
set( leapr_Clang_Windows_subproject_flags )
set( leapr_Clang_Windows_base_project_flags )
set( leapr_Clang_Windows_profile_generate_flags "-fprofile-generate='${CMAKE_BINARY_DIR}/profiling'" )
set( leapr_Clang_Windows_link_time_optimization_flags "-flto" )
set( leapr_Clang_Windows_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
set( leapr_Clang_Windows_nonportable_optimization_flags "-march=native" )
set( leapr_Clang_Windows_static_flags "-static" )
set( leapr_Clang_Darwin_common_flags "-stdlib=libc++" "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" )
set( leapr_Clang_Darwin_DEBUG_flags "-O0" "-g" "-gdwarf-3" )
set( leapr_Clang_Darwin_RELEASE_flags "-O3" "-DNDEBUG" )
Expand All @@ -142,18 +154,6 @@ set( leapr_Clang_Linux_link_time_optimization_flags "-flto" )
set( leapr_Clang_Linux_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
set( leapr_Clang_Linux_nonportable_optimization_flags "-march=native" )
set( leapr_Clang_Linux_static_flags "-static" )
set( leapr_Clang_Windows_common_flags "-stdlib=libc++" "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" )
set( leapr_Clang_Windows_DEBUG_flags "-O0" "-g" "-gdwarf-3" )
set( leapr_Clang_Windows_RELEASE_flags "-O3" "-DNDEBUG" )
set( leapr_Clang_Windows_strict_flags "-Werror" )
set( leapr_Clang_Windows_coverage_flags "--coverage" )
set( leapr_Clang_Windows_subproject_flags )
set( leapr_Clang_Windows_base_project_flags )
set( leapr_Clang_Windows_profile_generate_flags "-fprofile-generate='${CMAKE_BINARY_DIR}/profiling'" )
set( leapr_Clang_Windows_link_time_optimization_flags "-flto" )
set( leapr_Clang_Windows_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
set( leapr_Clang_Windows_nonportable_optimization_flags "-march=native" )
set( leapr_Clang_Windows_static_flags "-static" )

if ( static_leapr )
set( leapr_library_linkage STATIC )
Expand Down Expand Up @@ -222,10 +222,6 @@ add_library( leapr ${leapr_library_linkage}
"${CMAKE_CURRENT_SOURCE_DIR}/src/contin/contin_util/start_util/normalize.h"
"${CMAKE_CURRENT_SOURCE_DIR}/src/contin/contin_util/start_util/getEffectiveTemp.h"
"${CMAKE_CURRENT_SOURCE_DIR}/src/contin/contin_util/start_util/getDebyeWaller.h"
"${CMAKE_CURRENT_SOURCE_DIR}/src/endout/endout.h"
"${CMAKE_CURRENT_SOURCE_DIR}/src/endout/endout_util/tpidio.h"
"${CMAKE_CURRENT_SOURCE_DIR}/src/endout/endout_util/contio.h"
"${CMAKE_CURRENT_SOURCE_DIR}/src/endout/endout_util/repoz.h"
"${CMAKE_CURRENT_SOURCE_DIR}/src/discre/discre.h"
"${CMAKE_CURRENT_SOURCE_DIR}/src/discre/discre_util/prepareParams.h"
"${CMAKE_CURRENT_SOURCE_DIR}/src/discre/discre_util/addDeltaFuncs.h"
Expand Down Expand Up @@ -302,8 +298,6 @@ if( NOT is_subproject )
add_subdirectory( src/discre/test )
add_subdirectory( src/discre/discre_util/test )
add_subdirectory( src/discre/discre_util/oscLoopFuncs_util/test )
add_subdirectory( src/endout/test )
add_subdirectory( src/endout/endout_util/test )
add_subdirectory( src/generalTools/test )
add_subdirectory( src/test )
add_subdirectory( src/skold/test )
Expand Down
8 changes: 6 additions & 2 deletions docs/additional.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,10 @@ In fact, when considering the cross section obtained using the above phonon spec
-------------------------------------------------------------------------------

.. _additional_phonon_expansion:

Phonon Expansion Method
---------------------------------
===========================

As mentioned in :ref:`theory_incoherent_contin`, the scattering law equations that need be solved are

Expand Down Expand Up @@ -123,8 +125,10 @@ and
-------------------------------------------------------------------------------

.. _additional_discrete_oscillator:

Discrete Oscillator Method
---------------------------------
==============================

Recall from :ref:`theory_incoherent_contin` that definition of the non-symmetric scattering law (in the incoherent and Gaussian approximations) is

Expand Down
30 changes: 15 additions & 15 deletions docs/theory.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ where
| | | LEAPR inputs with which the ENDF files were generated. In those LEAPR inputs |
| | | are phonon distributions. |
+-------------------+-----------------------------------------------------------------------------------+
| | Derivation of | | Please see [ ] this will show how we |
| | Eq. [ ] | | got to the phonon expansion |
| | Derivation of | | Please see :ref:`additional_phonon_expansion` |
| | Phonon Expansion| |
+-------------------+-----------------------------------------------------------------------------------+
| | | |
+-------------------+-----------------------------------------------------------------------------------+
Expand Down Expand Up @@ -233,19 +233,19 @@ To process the scattering law for a material described by discrete oscillators,
.. seealso::
**Want more information?**

+-----------------------+---------------------------------------------+-----------------------------------+
| Topic | Internal resources | External resources |
+=======================+=============================================+===================================+
| | Equivalence between | | please see [ ] | |
| | discrete oscillator | | | |
| | and continuous | | | |
| | treatment | | | |
+-----------------------+---------------------------------------------+-----------------------------------+
| | Experimental support| | Please see [ ] this will show how we | |
| | for validity of the | | got to the phonon expansion | |
| | discrete oscillator | | | |
| | treatment | | | |
+-----------------------+---------------------------------------------+-----------------------------------+
+-----------------------+---------------------------------------------------------------------------------+
| Topic | Resources |
+=======================+=================================================================================+
| | Equivalence between | | Please see :ref:`additional_discrete_oscillator` |
| | discrete oscillator | | |
| | and continuous | | |
| | treatment | | |
+-----------------------+---------------------------------------------------------------------------------+
.. | | Experimental support| | Please see [ ] this will show how we |
| | for validity of the | | got to the phonon expansion |
| | discrete oscillator | | |
| | treatment | | |
+-----------------------+---------------------------------------------------------------------------------+



Expand Down
11 changes: 0 additions & 11 deletions metaconfigure/description.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -374,10 +374,6 @@
"src/contin/contin_util/start_util/normalize.h",
"src/contin/contin_util/start_util/getEffectiveTemp.h",
"src/contin/contin_util/start_util/getDebyeWaller.h",
"src/endout/endout.h",
"src/endout/endout_util/tpidio.h",
"src/endout/endout_util/contio.h",
"src/endout/endout_util/repoz.h",
"src/discre/discre.h",
"src/discre/discre_util/prepareParams.h",
"src/discre/discre_util/addDeltaFuncs.h",
Expand Down Expand Up @@ -485,13 +481,6 @@
"discre.discre_util.oscLoopFuncs_util": [
"src/discre/discre_util/oscLoopFuncs_util/test/bfact.test.cpp"
],
"endout": [
"src/endout/test/endout.test.cpp"
],
"endout.endout_util": [
"src/endout/endout_util/test/tpidio.test.cpp",
"src/endout/endout_util/test/repoz.test.cpp"
],
"generalTools": [
"src/generalTools/test/interpolate.test.cpp",
"src/generalTools/test/trapezoidIntegral.test.cpp"
Expand Down

0 comments on commit c8bdc4c

Please sign in to comment.