From b79fbdc6e3bdd14d7100da1f2dc2d31dceb7210d Mon Sep 17 00:00:00 2001 From: Ashkbiz Danehkar Date: Thu, 29 Apr 2021 22:35:25 -0400 Subject: [PATCH 1/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ded7211..dfe0e10 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ## MOCASSIN-2.0 [![Build Status](https://travis-ci.org/mocassin/MOCASSIN-2.0.svg?branch=master)](https://travis-ci.org/mocassin/MOCASSIN-2.0) [![Binder](http://mybinder.org/badge.svg)](http://mybinder.org/repo/mocassin/mocassin-2.0) -[![GitHub license](https://img.shields.io/aur/license/yaourt.svg)](https://github.com/mocassin/MOCASSIN-2.0/blob/master/LICENSE) +[![GitHub license](https://img.shields.io/badge/license-GPL-blue.svg)](https://github.com/mocassin/MOCASSIN-2.0/blob/master/LICENSE) **MOnte CArlo SimulationS of Ionized Nebulae**, Version 2.0 From cdec90623e8d2e9a49b7f5c1503d9e89974f3166 Mon Sep 17 00:00:00 2001 From: Ashkbiz Danehkar Date: Thu, 29 Apr 2021 22:39:35 -0400 Subject: [PATCH 2/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dfe0e10..d19717a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ## MOCASSIN-2.0 -[![Build Status](https://travis-ci.org/mocassin/MOCASSIN-2.0.svg?branch=master)](https://travis-ci.org/mocassin/MOCASSIN-2.0) +[![Build Status](https://travis-ci.com/mocassin/MOCASSIN-2.0.svg?branch=master)](https://travis-ci.com/mocassin/MOCASSIN-2.0) [![Binder](http://mybinder.org/badge.svg)](http://mybinder.org/repo/mocassin/mocassin-2.0) [![GitHub license](https://img.shields.io/badge/license-GPL-blue.svg)](https://github.com/mocassin/MOCASSIN-2.0/blob/master/LICENSE) From 85389374cef6d35e831ab1fd6875e1a1eddcf8ca Mon Sep 17 00:00:00 2001 From: Ashkbiz Danehkar Date: Thu, 29 Apr 2021 22:40:27 -0400 Subject: [PATCH 3/7] Update .travis.yml --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e253800..9a4328f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,11 +7,13 @@ before_install: matrix: include: - os: linux - dist: trusty + dist: focal + arch: amd64 sudo: required env: PLUMED_CC=mpif90 PLUMED_CXX=mpif90 MAKEDOC=yes PLUMED_ALL_TESTS=yes - os: linux - dist: trusty + dist: focal + arch: amd64 sudo: required env: PLUMED_CC=mpif90 PLUMED_CXX=mpif90 PLUMED_CXXFLAGS=-O3 LAPACK=yes CONFIG_FLAGS="--disable-external-lapack" From ecae861e5d1b1d34d611d29d5910a3e37938bf2b Mon Sep 17 00:00:00 2001 From: Ashkbiz Danehkar Date: Thu, 29 Apr 2021 22:47:10 -0400 Subject: [PATCH 4/7] Update iteration_mod.f90 --- source/iteration_mod.f90 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/source/iteration_mod.f90 b/source/iteration_mod.f90 index c36e49c..4b3fcb9 100644 --- a/source/iteration_mod.f90 +++ b/source/iteration_mod.f90 @@ -540,11 +540,9 @@ recursive subroutine iterateMC() ! estimators of Jste and Jdif at every grid cell if (taskid < rest) then load = load+1 - call energyPacketDriver(iStar=0,n=load, grid=grid(1:nGrids), & - & gpLoc=gpLoc, cellLoc=cellLoc) + call energyPacketDriver(iStar=0,n=load, grid=grid(1:nGrids), gpLoc=gpLoc, cellLoc=cellLoc) else - call energyPacketDriver(iStar=0,n=load, grid=grid(1:nGrids), & - & gpLoc=gpLoc, cellLoc=cellLoc) + call energyPacketDriver(iStar=0,n=load, grid=grid(1:nGrids), gpLoc=gpLoc, cellLoc=cellLoc) end if call mpi_barrier(mpi_comm_world, ierr) From ff90359ff748550501b203a36b6256c659ee91a2 Mon Sep 17 00:00:00 2001 From: Ashkbiz Danehkar Date: Thu, 29 Apr 2021 22:59:18 -0400 Subject: [PATCH 5/7] Update iteration_mod.f90 --- source/iteration_mod.f90 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source/iteration_mod.f90 b/source/iteration_mod.f90 index 4b3fcb9..c36e49c 100644 --- a/source/iteration_mod.f90 +++ b/source/iteration_mod.f90 @@ -540,9 +540,11 @@ recursive subroutine iterateMC() ! estimators of Jste and Jdif at every grid cell if (taskid < rest) then load = load+1 - call energyPacketDriver(iStar=0,n=load, grid=grid(1:nGrids), gpLoc=gpLoc, cellLoc=cellLoc) + call energyPacketDriver(iStar=0,n=load, grid=grid(1:nGrids), & + & gpLoc=gpLoc, cellLoc=cellLoc) else - call energyPacketDriver(iStar=0,n=load, grid=grid(1:nGrids), gpLoc=gpLoc, cellLoc=cellLoc) + call energyPacketDriver(iStar=0,n=load, grid=grid(1:nGrids), & + & gpLoc=gpLoc, cellLoc=cellLoc) end if call mpi_barrier(mpi_comm_world, ierr) From d32a772f358a66e68887ca8cd167c0eb88b96ec5 Mon Sep 17 00:00:00 2001 From: Ashkbiz Danehkar Date: Thu, 29 Apr 2021 23:08:06 -0400 Subject: [PATCH 6/7] Update iteration_mod.f90 --- source/iteration_mod.f90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/iteration_mod.f90 b/source/iteration_mod.f90 index c36e49c..605aa63 100644 --- a/source/iteration_mod.f90 +++ b/source/iteration_mod.f90 @@ -541,10 +541,10 @@ recursive subroutine iterateMC() if (taskid < rest) then load = load+1 call energyPacketDriver(iStar=0,n=load, grid=grid(1:nGrids), & - & gpLoc=gpLoc, cellLoc=cellLoc) + & gpLoc, cellLoc=cellLoc) else call energyPacketDriver(iStar=0,n=load, grid=grid(1:nGrids), & - & gpLoc=gpLoc, cellLoc=cellLoc) + & gpLoc, cellLoc=cellLoc) end if call mpi_barrier(mpi_comm_world, ierr) From 4ca47c393949125b09bc715453a24c439342a4be Mon Sep 17 00:00:00 2001 From: Ashkbiz Danehkar Date: Thu, 29 Apr 2021 23:12:49 -0400 Subject: [PATCH 7/7] Update iteration_mod.f90 --- source/iteration_mod.f90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/iteration_mod.f90 b/source/iteration_mod.f90 index 605aa63..c36e49c 100644 --- a/source/iteration_mod.f90 +++ b/source/iteration_mod.f90 @@ -541,10 +541,10 @@ recursive subroutine iterateMC() if (taskid < rest) then load = load+1 call energyPacketDriver(iStar=0,n=load, grid=grid(1:nGrids), & - & gpLoc, cellLoc=cellLoc) + & gpLoc=gpLoc, cellLoc=cellLoc) else call energyPacketDriver(iStar=0,n=load, grid=grid(1:nGrids), & - & gpLoc, cellLoc=cellLoc) + & gpLoc=gpLoc, cellLoc=cellLoc) end if call mpi_barrier(mpi_comm_world, ierr)