Commit 4d8c5766 authored by Berrill, Mark's avatar Berrill, Mark
Browse files

Syncing changes from full application

parent 2a8a6fa3

build/configure

+2 −1
Original line number Diff line number Diff line
@@ -2,9 +2,10 @@ 


export KOKKOS_DIR=/packages/TPLs/install/opt/kokkos



rm -rf CMake*



cmake                                   \

   -D CMAKE_BUILD_TYPE=Release          \

   -D CMAKE_C_COMPILER=gcc              \

   -D CMAKE_CXX_COMPILER=g++            \

   -D CXX_STD=11                        \

   -D USE_OPENACC=0                     \

src/CMakeLists.txt

+1 −6
Original line number Diff line number Diff line 
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)

IF ( ${CMAKE_MAJOR_VERSION} EQUAL 3 )

    IF ( NOT ( ${CMAKE_MINOR_VERSION} EQUAL 0 ) )

        CMAKE_POLICY(SET CMP0053 OLD)

    ENDIF()

ENDIF()

CMAKE_MINIMUM_REQUIRED(VERSION 3.4)



MESSAGE( "==============================" )

MESSAGE( "Configuring Ray Trace MiniApps" )

src/CreateImage.cpp

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#ifdef USE_KOKKOS

#include <Kokkos_Core.hpp>

#include <Kokkos_Cuda.hpp>

#endif

src/RayTraceStructures.cpp

+3 −3
Original line number Diff line number Diff line
@@ -2144,7 +2144,6 @@ RayTrace::create_image_struct::create_image_struct() 
    N          = 0;

    N_start    = 0;

    N_parallel = 1;

    dz         = 0.0;

    euv_beam   = NULL;

    seed_beam  = NULL;

    gain       = NULL;
@@ -2188,7 +2187,7 @@ std::pair<char *, size_t> RayTrace::create_image_struct::pack( int compression ) 
    pack_buffer<int>( N, pos, data );

    pack_buffer<int>( N_start, pos, data );

    pack_buffer<int>( N_parallel, pos, data );

    pack_buffer<double>( dz, pos, data );

    pack_buffer<double>( euv_beam->dz, pos, data );

    // Copy euv_beam to the buffer

    pack_buffer<unsigned int>( (unsigned int) euv_beam_data.second, pos, data );

    memcpy( &data[pos], euv_beam_data.first, euv_beam_data.second );
@@ -2235,7 +2234,8 @@ void RayTrace::create_image_struct::unpack( std::pair<const char *, size_t> data 
    N          = unpack_buffer<int>( pos, data );

    N_start    = unpack_buffer<int>( pos, data );

    N_parallel = unpack_buffer<int>( pos, data );

    dz         = unpack_buffer<double>( pos, data );

    double dz  = unpack_buffer<double>( pos, data );

    NULL_USE( dz );

    // Copy euv_beam from the buffer

    unsigned int N_bytes_tmp = unpack_buffer<unsigned int>( pos, data );

    if ( N_bytes_tmp > 0 ) {

src/RayTraceStructures.h

+0 −1
Original line number Diff line number Diff line
@@ -326,7 +326,6 @@ struct create_image_struct { 
    //! to a unique number for each thread)

    int N_parallel; //!<  Number of rays processed in parallel (set to 0 for domain based

    //! decomposition, otherwise set to the number of threads)

    double dz;                       //!<  Grid size along the length

    const EUV_beam_struct *euv_beam; //!<  Input beam structure that contains information about the

    //! desired euv beam grid

    const seed_beam_struct *seed_beam; //!<  Input seed beam structure (may be NULL)