From da9ed202d9b4e2f519368652099b71df39ed88bd Mon Sep 17 00:00:00 2001 From: Neil Wu Date: Mon, 5 Jul 2021 11:22:53 -0400 Subject: [PATCH 1/5] fixed order of type declaration --- src/cgns_utilities.F90 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cgns_utilities.F90 b/src/cgns_utilities.F90 index 6c62c3a..a5cc0e9 100644 --- a/src/cgns_utilities.F90 +++ b/src/cgns_utilities.F90 @@ -715,10 +715,10 @@ subroutine refine(Xin, Xout, refine_i, refine_j, refine_k, il, jl, kl ) implicit none ! Input/Output + integer, intent(in) :: il, jl ,kl real(kind=8), intent(in), dimension(il, jl, kl, 3) :: Xin ! either a 0 (don't refine along that axis) or 1 (do refine along the axis) integer, intent(in) :: refine_i, refine_j, refine_k - integer, intent(in) :: il, jl ,kl real(kind=8), intent(out), dimension((il-1)*2**refine_i+1, (jl-1)*2**refine_j+1, (kl-1)*2**refine_k+1, 3) :: Xout ! Working integer :: i, j, k, ii, jj, kk, idim, ill, jll, kll @@ -845,8 +845,8 @@ subroutine interpEdge(Xcoarse, Xfine, il) implicit none ! Input/Output - real(kind=8), intent(in), dimension(il, 3) :: Xcoarse integer, intent(in) :: il + real(kind=8), intent(in), dimension(il, 3) :: Xcoarse real(kind=8), intent(inout), dimension((il-1)*2+1, 3) ::Xfine ! Working @@ -870,8 +870,8 @@ subroutine interpFace(Xcoarse, Xfine, il, jl) implicit none ! Input/Output - real(kind=8), intent(in), dimension(il, jl, 3) :: Xcoarse integer, intent(in) :: il, jl + real(kind=8), intent(in), dimension(il, jl, 3) :: Xcoarse real(kind=8), intent(inout), dimension((il-1)*2+1, (jl-1)*2+1, 3) ::Xfine ! Working @@ -1425,8 +1425,8 @@ subroutine computeConnectivity(inCoords, nCoords, sizes, nBlock, tol) implicit none ! Input/Output - real(kind=8), dimension(3*nCoords), intent(in):: inCoords integer, intent(in) :: nCoords, nBlock + real(kind=8), dimension(3*nCoords), intent(in):: inCoords integer, dimension(3, nBlock), intent(in) :: sizes real(kind=8), intent(in) :: tol ! Working @@ -2150,8 +2150,8 @@ subroutine findBounds(x, xBounds, il, jl, kl) implicit none ! Subroutine inputs - real(kind=8), dimension(il,jl,kl,3), intent(in) :: x integer, intent(in) :: il, jl, kl + real(kind=8), dimension(il,jl,kl,3), intent(in) :: x ! Subroutine inputs/outputs. real(kind=8), dimension(2,3), intent(inout) :: xBounds @@ -2246,9 +2246,9 @@ subroutine computeVolumes(x, xBounds, binVolX, binVolY, binVolZ, & implicit none ! Subroutine inputs + integer, intent(in) :: il, jl, kl, nBinX, nBinY, nBinZ real(kind=8), dimension(il,jl,kl,3), intent(in) :: x real(kind=8), dimension(2,3), intent(in) :: xBounds - integer, intent(in) :: il, jl, kl, nBinX, nBinY, nBinZ ! Subroutine inputs/outputs. real(kind=8), dimension(nBinX), intent(inout) :: binVolX From 75375ef49d4843feaa7b8afa1f74551216aa0baf Mon Sep 17 00:00:00 2001 From: Neil Wu Date: Mon, 5 Jul 2021 11:23:07 -0400 Subject: [PATCH 2/5] other minor fixes --- src/cgns_utilities.F90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cgns_utilities.F90 b/src/cgns_utilities.F90 index a5cc0e9..0a489a8 100644 --- a/src/cgns_utilities.F90 +++ b/src/cgns_utilities.F90 @@ -2603,7 +2603,7 @@ subroutine convertPlot3d(pFile, cFile) integer(kind=4) :: nZones, i, j, k, cg, dims(9), zoneID, ierr, Cx, Cy, Cz, iZone integer(kind=4), dimension(:, :), allocatable :: sizes real(kind=8), dimension(:, :, :), allocatable :: coorX, coorY, coorZ - character*12 :: zoneName + character(len=12) :: zoneName ! We will be assuming multiblock, unformatted without iblank array. open (unit=50, form='unformatted', file=pFile) @@ -2622,7 +2622,7 @@ subroutine convertPlot3d(pFile, cFile) zoneLoop: do iZone=1, nZones ! Write the zone itself. - write(zoneName, "((a) (I5))") 'Domain.', izone + write(zoneName, "((a), (I5))") 'Domain.', izone dims(1:3) = sizes(:, iZone) call writeZone(cg, zoneName, dims, zoneID) From 65a30d027ae2bf0c35ba4673f3bb96663ed9f6b5 Mon Sep 17 00:00:00 2001 From: Neil Wu Date: Mon, 5 Jul 2021 11:24:34 -0400 Subject: [PATCH 3/5] updated config file --- config/defaults/config.LINUX_GFORTRAN.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/defaults/config.LINUX_GFORTRAN.mk b/config/defaults/config.LINUX_GFORTRAN.mk index 29884e7..f30ec39 100644 --- a/config/defaults/config.LINUX_GFORTRAN.mk +++ b/config/defaults/config.LINUX_GFORTRAN.mk @@ -9,7 +9,7 @@ CGNS_LINKER_FLAGS=-L$(CGNS_HOME)/lib -lcgns CC = gcc CFLAGS = -O2 -fPIC FC = gfortran -FFLAGS= -O2 -fdefault-real-8 -g -fPIC +FFLAGS= -O2 -fdefault-real-8 -g -fPIC -std=f2003 # Define potentially different python, python-config and f2py executables: PYTHON = python From 863f65c23210d507f2d3b2bb5e57ac8752658dba Mon Sep 17 00:00:00 2001 From: Neil Wu <602725+nwu63@users.noreply.github.com> Date: Wed, 7 Jul 2021 14:19:12 -0400 Subject: [PATCH 4/5] Update config.LINUX_INTEL.mk --- config/defaults/config.LINUX_INTEL.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/defaults/config.LINUX_INTEL.mk b/config/defaults/config.LINUX_INTEL.mk index 76eb402..a67ea89 100644 --- a/config/defaults/config.LINUX_INTEL.mk +++ b/config/defaults/config.LINUX_INTEL.mk @@ -9,7 +9,7 @@ CGNS_LINKER_FLAGS=-L$(CGNS_HOME)/lib -lcgns CC = gcc CFLAGS = -O2 -fPIC FC = ifort -FFLAGS = -O2 -r8 -g -fPIC +FFLAGS = -O2 -r8 -g -fPIC -stand f03 # Define potentially different python, python-config and f2py executables: PYTHON = python From 3773e7f3259b1f2ce5fa7a269383e1dd6b832f50 Mon Sep 17 00:00:00 2001 From: Neil Wu Date: Thu, 8 Jul 2021 10:03:59 -0400 Subject: [PATCH 5/5] switch to F2008 --- config/defaults/config.LINUX_GFORTRAN.mk | 2 +- config/defaults/config.LINUX_INTEL.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/defaults/config.LINUX_GFORTRAN.mk b/config/defaults/config.LINUX_GFORTRAN.mk index f30ec39..b6e549d 100644 --- a/config/defaults/config.LINUX_GFORTRAN.mk +++ b/config/defaults/config.LINUX_GFORTRAN.mk @@ -9,7 +9,7 @@ CGNS_LINKER_FLAGS=-L$(CGNS_HOME)/lib -lcgns CC = gcc CFLAGS = -O2 -fPIC FC = gfortran -FFLAGS= -O2 -fdefault-real-8 -g -fPIC -std=f2003 +FFLAGS= -O2 -fdefault-real-8 -g -fPIC -std=f2008 # Define potentially different python, python-config and f2py executables: PYTHON = python diff --git a/config/defaults/config.LINUX_INTEL.mk b/config/defaults/config.LINUX_INTEL.mk index a67ea89..d2f6946 100644 --- a/config/defaults/config.LINUX_INTEL.mk +++ b/config/defaults/config.LINUX_INTEL.mk @@ -9,7 +9,7 @@ CGNS_LINKER_FLAGS=-L$(CGNS_HOME)/lib -lcgns CC = gcc CFLAGS = -O2 -fPIC FC = ifort -FFLAGS = -O2 -r8 -g -fPIC -stand f03 +FFLAGS = -O2 -r8 -g -fPIC -stand f08 # Define potentially different python, python-config and f2py executables: PYTHON = python