From 4f7bb8946169bb635459f8112527765a6d31458b Mon Sep 17 00:00:00 2001
From: ignis <ignisization@gmail.com>
Date: Fri, 22 Aug 2014 12:01:12 +0900
Subject: [PATCH] remove omp

---
 Makefile       |  4 ++--
 m_fdm_calc.f90 | 16 +++++++---------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index f68f052..0572750 100644
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,8 @@ ifeq ($(OMPI), 1)
         FFTW_HOME = ../libs/fftw-3.2.2/lib
         OPENMPI_HOME = /home/comb/ignis/openmpi/
         MPIF90 = $(OPENMPI_HOME)/bin/mpif90
-        FCFLAGS = -i8 -r8 -c -openmp $(MPI_COMPILE_FLAGS) -I$(FFTW_HOME)/include -I$(OPENMPI_HOME)/include
-        LDFLAGS = -i8 -r8 -openmp $(MPI_LD_FLAGS) -L$(FFTW_HOME)/lib -lfftw3 -L$(OPENMPI_HOME)/lib -lfftw3 -lm  -shared-intel
+        FCFLAGS = -i8 -r8 -c $(MPI_COMPILE_FLAGS) -I$(FFTW_HOME)/include -I$(OPENMPI_HOME)/include
+        LDFLAGS = -i8 -r8 $(MPI_LD_FLAGS) -L$(FFTW_HOME)/lib -lfftw3 -L$(OPENMPI_HOME)/lib -lfftw3 -lm  -shared-intel
         FCFLAGS_F77 = -Mextend
 
         MODULES += m_openmpi.o
diff --git a/m_fdm_calc.f90 b/m_fdm_calc.f90
index 1a4fe2c..8004adc 100644
--- a/m_fdm_calc.f90
+++ b/m_fdm_calc.f90
@@ -77,6 +77,10 @@ module m_fdm_calc
       allocate(y2(2,nx,ny,nz_all))
       allocate(yf(2,nx,ny,nz_all))
 
+      y1=0.0
+      y2=0.0
+      yf=0.0
+
       CALL ludcmp(nx,ny,nz_all,1,0,0)
 
       refwr=pre*1.*exp(-ac/(1.+bc*c_ref))  ! Kwon
@@ -220,7 +224,6 @@ module m_fdm_calc
 !----------------------------------------------------------------
           umax=-1.0d300;umin=1.0d300;vmax=-1.0d300;vmin=1.0d300;wmax=-1.0d300;wmin=1.0d300
 
-!$omp parallel do private(i,j,k) reduction(max:umax,vmax,wmax) reduction(min:umin,vmin,wmin)  NUM_THREADS(6) schedule(static)
           do k=1,nz_all
           do j=1,ny
           do i=1,nx
@@ -249,7 +252,9 @@ module m_fdm_calc
         fdmtime=time+fdmdt
         write(*,'(a30,3x,4f12.7)')' ** DT, visdt, convdt, fdmdt =' , DT,visdt,convdt,fdmdt
 
-!$omp parallel do private(i,j,k,yr,wrate) reduction(+:sum_wrate,sumc) NUM_THREADS(6) schedule(static)
+        sumc=0.
+        sum_wrate=0.
+
         do k=1,nz_all
         do j=1,ny
         do i=1,nx
@@ -320,7 +325,6 @@ module m_fdm_calc
       real*8 :: Ly(yy,zz),Dy
 
 ! x-direction
-!$omp parallel do private(i,j,k,ux,dux,d2ux,wrate,uy,duy,d2uy) NUM_THREADS(6) schedule(static)
       DO k=1,zz
        DO j=1,yy
         DO i=1,xx
@@ -378,7 +382,6 @@ module m_fdm_calc
       ENDDO
 
 !! z-direction
-!$omp parallel do private(i,j,k,uz,duz,d2uz) NUM_THREADS(6) schedule(static)
       DO j=1,yy
        DO i=1,xx
         DO k=1,zz
@@ -404,7 +407,6 @@ module m_fdm_calc
       ENDDO
 
 !    Boundary condition
-!$omp parallel do private(k,j,i) NUM_THREADS(6) schedule(static)
       DO k=1,zz
        DO j=1,yy
         DO i=1,yrsw
@@ -477,7 +479,6 @@ module m_fdm_calc
       IF(istage<5) THEN
         at=a(istage)*fdmdt
         bt=(b(istage)-a(istage))*fdmdt
-!$omp parallel do private(k,j,i,nv) NUM_THREADS(6) schedule(static)
         DO k=1,zz
          DO j=1,yy
           DO i=1,xx
@@ -490,9 +491,6 @@ module m_fdm_calc
         ENDDO
       ELSE
         bt=b(istage)*fdmdt
-        sumc=0.
-        sum_wrate=0.
-!$omp parallel do private(k,j,i,nv) NUM_THREADS(6) schedule(static)
         DO k=1,zz
          DO j=1,yy
           DO i=1,xx