Commit 08ed2ade authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Merge branch 'clu_subs_omp' into 'master' 

Test OpenMP parallelism and Offload for clu_subs

See merge request giacomo.mulas/np_tmcode!104
parents 8ccabe27 242cf3ec

.gitlab-ci.yml

+13 −1
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ sanity_stage: 
      - hostname

      - echo $CI_COMMIT_SHA

      - echo $CI_COMMIT_BRANCH

      - ulimit -n 1024

      - cd build/libnptm

      - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH;$PWD"

      - cd ../testing
@@ -241,7 +242,7 @@ running_stage: 
         - build/inclusion/D*

         - build/sphere/c_*

         - build/sphere/D*

         #- build/trapping/*

         - build/trapping/c_*

      exclude:

         - ".git*"

         - ".git/**/*"
@@ -280,6 +281,11 @@ running_stage: 
      - echo "Running np_inclusion"

      - chmod +x np_inclusion

      - OMP_NUM_THREADS=1 ./np_inclusion DEDFB DINCLU .

      - cd ../trapping

      - echo "Running np_trapping"

      - chmod +x np_trapping

      - OMP_NUM_THREADS=1 ../sphere/np_sphere ../../test_data/trapping/DEDFB ../../test_data/trapping/DSPH .

      - ./np_trapping ../../test_data/trapping/DFRFME ../../test_data/trapping/DLFFFT .

      

testing_stage:

   stage: test
@@ -357,4 +363,10 @@ testing_stage: 
      - export FFILE=../../test_data/sphere/OSPH

      - python3 ../../src/scripts/pycompare.py --no-progress --ffile $FFILE --cfile c_OSPH

      - rm -rf c_OSPH

      - echo "Comparing output of TRAPPING"

      - cd ../trapping

      - export FFILE=../../test_data/trapping/fort.66

      - python3 ../../src/scripts/pycompare.py --no-progress --ffile $FFILE --cfile c_force_cs.txt

      - export FFILE=../../test_data/trapping/fort.67

      - python3 ../../src/scripts/pycompare.py --no-progress --data-order=-10 --ffile $FFILE --cfile c_torque_cs.txt

      
 No newline at end of file

CITATION.cff

+37 −10
Original line number Diff line number Diff line 
authors:

  - family-names: La Mura, Mulas, Saija

    given-names: Giovanni, Giacomo, Rosalba

cff-version: 1.2.0

license: GNU GPLv3

message: "If you use this software, please cite the references below."

repository-code: "https://www.ict.inaf.it/gitlab/giacomo.mulas/np_tmcode"

repository-code: "https://github.com/ICSC-Spoke3/NP_TMcode"

title: "Nano-particle Transition Matrix code"

version: 8.3

authors:

  - family-names: "La Mura"

    given-names: "Giovanni"

    orcid: "https://orcid.org/0000-0001-8553-499X"

    affiliation: "INAF - Osservatorio Astronomico di Cagliari"

  - family-names: "Mulas"

    given-names: "Giacomo"

    orcid: "https://orcid.org/0000-0003-0602-6669"

    affiliation: "INAF - Osservatorio Astronomico di Cagliari"

  - family-names: "Saija"

    given-names: "Rosalba"

    orcid: "https://orcid.org/0000-0002-5823-9749"

    affiliation: "Università degli Studi di Messina"

version: 10.3

license: GNU GPLv3

references:

  - authors:

    - family-names: Saija, Iatì, Borghese

      given-names: Rosalba, Maria Antonia, Ferdinando

    - family-names: "Saija"

      given-names: "Rosalba"

      orcid: "https://orcid.org/0000-0002-5823-9749"

      affiliation: "Università degli Studi di Messina"

    - family-names: "Iatì"

      given-names: "Maria Antonia"

      orcid: "https://orcid.org/0000-0002-3576-8656"

      affiliation: "CNR - Istituto per i Processi Chimico-Fisici"

    - family-names: "Borghese"

      given-names: "Ferdinando"

      affiliation: "Università degli Studi di Messina"

    doi: 10.1086/322350

    issue: 1

    journal: "The Astrophysical Journal"
@@ -20,8 +39,16 @@ references: 
    page: 993

    year: 2001

  - authors:

    - family-names: Borghese, Denti, Saija

      given-names: Ferdinando, Paolo, Rosalba

    - family-names: "Borghese"

      given-names: "Ferdinando"

      affiliation: "Università degli Studi di Messina"

    - family-names: "Denti"

      given-names: "Paolo"

      affiliation: "Università degli Studi di Messina"

    - family-names: "Saija"

      given-names: "Rosalba"

      orcid: "https://orcid.org/0000-0002-5823-9749"

      affiliation: "Università degli Studi di Messina"

    doi: 10.1007/978-3-540-37414-5

    title: "Scattering from Model Nonspherical Particles"

    type: book

build/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ else 
	CXXFLAGSLIB=-static

endif # LIBMODE

NP_DOC_SRCS=../doc/src/config.dox

NP_LIBNPTM_SRCS=../src/libnptm/algebraic.cpp ../src/libnptm/clu_subs_usm.cpp ../src/libnptm/Commons.cpp ../src/libnptm/Configuration.cpp ../src/libnptm/cublas_calls.cpp ../src/libnptm/file_io.cpp ../src/libnptm/inclu_subs.cpp ../src/libnptm/logging.cpp ../src/libnptm/lapack_calls.cpp ../src/libnptm/magma_calls.cpp ../src/libnptm/outputs.cpp ../src/libnptm/Parsers.cpp ../src/libnptm/sph_subs.cpp ../src/libnptm/tfrfme.cpp ../src/libnptm/tra_subs.cpp ../src/libnptm/TransitionMatrix.cpp ../src/libnptm/utils.cpp

NP_LIBNPTM_OBJS=../src/libnptm/algebraic.o ../src/libnptm/clu_subs_usm.o ../src/libnptm/Commons.o ../src/libnptm/Configuration.o ../src/libnptm/cublas_calls.o ../src/libnptm/file_io.o ../src/libnptm/inclu_subs.o ../src/libnptm/logging.o ../src/libnptm/lapack_calls.o ../src/libnptm/magma_calls.o ../src/libnptm/outputs.o ../src/libnptm/Parsers.o ../src/libnptm/sph_subs.o ../src/libnptm/tfrfme.o ../src/libnptm/tra_subs.o ../src/libnptm/TransitionMatrix.o ../src/libnptm/utils.o

NP_LIBNPTM_SRCS=../src/libnptm/algebraic.cpp ../src/libnptm/clu_subs.cpp ../src/libnptm/Commons.cpp ../src/libnptm/Configuration.cpp ../src/libnptm/cublas_calls.cpp ../src/libnptm/file_io.cpp ../src/libnptm/inclu_subs.cpp ../src/libnptm/logging.cpp ../src/libnptm/lapack_calls.cpp ../src/libnptm/magma_calls.cpp ../src/libnptm/outputs.cpp ../src/libnptm/Parsers.cpp ../src/libnptm/sph_subs.cpp ../src/libnptm/tfrfme.cpp ../src/libnptm/tra_subs.cpp ../src/libnptm/TransitionMatrix.cpp ../src/libnptm/utils.cpp

NP_LIBNPTM_OBJS=../src/libnptm/algebraic.o ../src/libnptm/clu_subs.o ../src/libnptm/Commons.o ../src/libnptm/Configuration.o ../src/libnptm/cublas_calls.o ../src/libnptm/file_io.o ../src/libnptm/inclu_subs.o ../src/libnptm/logging.o ../src/libnptm/lapack_calls.o ../src/libnptm/magma_calls.o ../src/libnptm/outputs.o ../src/libnptm/Parsers.o ../src/libnptm/sph_subs.o ../src/libnptm/tfrfme.o ../src/libnptm/tra_subs.o ../src/libnptm/TransitionMatrix.o ../src/libnptm/utils.o

NP_CLUSTER_SRCS=../src/cluster/np_cluster.cpp ../src/cluster/cluster.cpp

NP_CLUSTER_OBJS=../src/cluster/np_cluster.o ../src/cluster/cluster.o

NP_CLUSTER_BINS=cluster/np_cluster

doc/nptmcode-0.10.5_Manual.pdf

0 → 100644
+1.56 MiB

File added.

No diff preview for this file type.

View file

ref_data/eps_forsterite.csv

0 → 100644
+96 −0
Original line number Diff line number Diff line 
# Enstatite according to Cesare (Mie calculation)

#

# Wavelengths are in meters.

#

#Wavelength,Re(EPS),Im(EPS)

1.9900000e-07,2.9609650e+00,1.6656068e-02

2.0300000e-07,2.9030770e+00,1.1366942e-02

2.0700000e-07,2.8642216e+00,8.7759931e-03

2.1200000e-07,2.8290400e+00,6.9029488e-03

2.1600000e-07,2.8073117e+00,5.9094340e-03

2.2100000e-07,2.7853911e+00,5.0068493e-03

2.2600000e-07,2.7676046e+00,4.3586646e-03

2.3100000e-07,2.7528697e+00,3.8492925e-03

2.3700000e-07,2.7380960e+00,3.3756281e-03

2.4300000e-07,2.7257896e+00,3.0048142e-03

2.4900000e-07,2.7153459e+00,2.7024426e-03

2.5500000e-07,2.7063927e+00,2.4347656e-03

2.6200000e-07,2.6974131e+00,2.2007898e-03

2.6900000e-07,2.6896788e+00,2.0009695e-03

2.7600000e-07,2.6830149e+00,1.8345502e-03

2.8400000e-07,2.6763909e+00,1.7014067e-03

2.9200000e-07,2.6706352e+00,1.5688396e-03

3.0100000e-07,2.6650321e+00,1.4365935e-03

3.1100000e-07,2.6596676e+00,1.3046790e-03

3.2000000e-07,2.6554435e+00,1.2384604e-03

3.3200000e-07,2.6505799e+00,1.1396422e-03

3.4200000e-07,2.6470627e+00,1.0509188e-03

3.5400000e-07,2.6433383e+00,9.7550080e-04

3.6800000e-07,2.6396347e+00,9.0982937e-04

3.8100000e-07,2.6366154e+00,8.4435823e-04

3.9700000e-07,2.6334229e+00,7.7893559e-04

4.1300000e-07,2.6306791e+00,7.4609095e-04

4.3100000e-07,2.6279901e+00,6.8086523e-04

4.5100000e-07,2.6254425e+00,6.4812869e-04

4.7100000e-07,2.6232337e+00,6.1546320e-04

4.9600000e-07,2.6208813e+00,5.5043063e-04

5.2100000e-07,2.6188819e+00,5.1785471e-04

5.4900000e-07,2.6169209e+00,4.8530700e-04

5.8200000e-07,2.6149729e+00,4.5278458e-04

6.1700000e-07,2.6131798e+00,4.5262932e-04

6.5900000e-07,2.6113380e+00,4.2015051e-04

6.6700000e-07,2.6110358e+00,4.2012620e-04

7.1400000e-07,2.6093063e+00,3.8768034e-04

7.6900000e-07,2.6075293e+00,3.5525261e-04

8.3300000e-07,2.6057062e+00,3.5512840e-04

9.0900000e-07,2.6037530e+00,3.5499528e-04

1.0000000e-06,2.6015926e+00,3.8710688e-04

1.0500000e-06,2.6004259e+00,3.8702007e-04

1.1100000e-06,2.5990770e+00,4.1916299e-04

1.1800000e-06,2.5974750e+00,4.5126715e-04

1.2500000e-06,2.5958631e+00,4.8335048e-04

1.3300000e-06,2.5940059e+00,5.1538938e-04

1.4300000e-06,2.5915947e+00,6.1174037e-04

1.5400000e-06,2.5888121e+00,7.0795058e-04

1.6700000e-06,2.5853723e+00,8.6827103e-04

1.8200000e-06,2.5810836e+00,1.0700940e-03

2.0000000e-06,2.5755133e+00,1.3801630e-03

2.1100000e-06,2.5718440e+00,1.6036971e-03

2.2200000e-06,2.5680017e+00,1.8588985e-03

2.3500000e-06,2.5631818e+00,2.1919230e-03

2.5000000e-06,2.5572710e+00,2.6442429e-03

2.6700000e-06,2.5501064e+00,3.2175841e-03

2.8600000e-06,2.5414247e+00,3.9645808e-03

3.0800000e-06,2.5304970e+00,5.0290252e-03

3.3300000e-06,2.5168746e+00,6.4509146e-03

3.6400000e-06,2.4981126e+00,8.6057671e-03

4.0000000e-06,2.4734676e+00,1.1837424e-02

4.4400000e-06,2.4386947e+00,1.6979943e-02

5.0000000e-06,2.3859012e+00,2.6205644e-02

5.7100000e-06,2.3020099e+00,4.4145823e-02

6.6700000e-06,2.1466277e+00,8.8721313e-02

8.0000000e-06,1.7956675e+00,2.5779891e-01

9.4853120e-06,1.2292200e+00,1.3071200e+00

1.0000000e-05,1.7325238e+00,2.0804736e+00

1.0423420e-05,2.4302100e+00,2.2572500e+00

1.1100000e-05,3.1655555e+00,1.7797264e+00

1.2500000e-05,3.2341845e+00,6.5477348e-01

1.2993580e-05,2.8924800e+00,5.5801000e-01

1.4300000e-05,2.4639910e+00,6.6583182e-01

1.6700000e-05,1.8618525e+00,1.5508809e+00

2.0000000e-05,2.7207078e+00,2.2935692e+00

2.2200000e-05,2.9672205e+00,2.6449530e+00

2.5000000e-05,3.7541127e+00,2.9224749e+00

2.8600000e-05,4.5247521e+00,2.6001147e+00

3.3300000e-05,4.9292458e+00,2.1151536e+00

4.0000000e-05,5.1533428e+00,1.6867507e+00

4.4400000e-05,5.2312813e+00,1.4939388e+00

5.0000000e-05,5.2944113e+00,1.3063137e+00

5.7100000e-05,5.3433740e+00,1.1335408e+00

6.6700000e-05,5.3849672e+00,9.6489482e-01

8.0000000e-05,5.4203796e+00,8.0438064e-01

1.0000000e-04,5.4512572e+00,6.4723972e-01

1.2500000e-04,5.4735667e+00,5.2187640e-01

1.5400000e-04,5.4885283e+00,4.2593310e-01

2.0000000e-04,5.5011559e+00,3.3190790e-01

2.8600000e-04,5.5117006e+00,2.3683715e-01