[Commits] [svn:einsteintoolkit] Exact/trunk/src/ (Rev. 274)

[knarf at cct.lsu.edu]

User: knarf
Date: 2012/05/25 01:18 PM

Modified:
 /trunk/src/
  gauge.F77, initialize.F77

Log:
 disable openmp in Exact for ET_2012_05 release. There are problems due to saved variables in several metrics, but it is too late to fix and test all of them now. No openmp should not be a serious issue in Exact as it is fast and usually only used for initial data

File Changes:

Directory: /trunk/src/
======================

File [modified]: gauge.F77
Delta lines: +19 -19
===================================================================
--- trunk/src/gauge.F77	2012-05-09 22:58:08 UTC (rev 273)
+++ trunk/src/gauge.F77	2012-05-25 18:18:27 UTC (rev 274)
@@ -88,25 +88,25 @@
 
       if ( set_lapse .or. set_shift .or. set_dtlapse .or. set_dtshift) then
 
-C$omp    parallel do private (
-C$omp$     i, j, k,
-C$omp$     tt, xx, yy, zz,
-C$omp$     alptmp, dtalptmp, axtmp, aytmp, aztmp, 
-C$omp$     betaxtmp, betaytmp, betaztmp,
-C$omp$     dtbetaxtmp, dtbetaytmp, dtbetaztmp,
-C$omp$     bxxtmp, bxytmp, bxztmp, 
-C$omp$     byxtmp, byytmp, byztmp, 
-C$omp$     bzxtmp, bzytmp, bzztmp,
-C$omp$     dxgxxtmp, dxgyytmp, dxgzztmp, 
-C$omp$     dxgxytmp, dxgyztmp, dxgxztmp,
-C$omp$     dygxxtmp, dygyytmp, dygzztmp, 
-C$omp$     dygxytmp, dygyztmp, dygxztmp,
-C$omp$     dzgxxtmp, dzgyytmp, dzgzztmp, 
-C$omp$     dzgxytmp, dzgyztmp, dzgxztmp,
-C$omp$     exact_psi,
-C$omp$     exact_psix, exact_psiy, exact_psiz,
-C$omp$     exact_psixx, exact_psiyy, exact_psizz,
-C$omp$     exact_psixy, exact_psiyz, exact_psixz)
+C$o mp    parallel do private (
+C$o mp$     i, j, k,
+C$o mp$     tt, xx, yy, zz,
+C$o mp$     alptmp, dtalptmp, axtmp, aytmp, aztmp, 
+C$o mp$     betaxtmp, betaytmp, betaztmp,
+C$o mp$     dtbetaxtmp, dtbetaytmp, dtbetaztmp,
+C$o mp$     bxxtmp, bxytmp, bxztmp, 
+C$o mp$     byxtmp, byytmp, byztmp, 
+C$o mp$     bzxtmp, bzytmp, bzztmp,
+C$o mp$     dxgxxtmp, dxgyytmp, dxgzztmp, 
+C$o mp$     dxgxytmp, dxgyztmp, dxgxztmp,
+C$o mp$     dygxxtmp, dygyytmp, dygzztmp, 
+C$o mp$     dygxytmp, dygyztmp, dygxztmp,
+C$o mp$     dzgxxtmp, dzgyytmp, dzgzztmp, 
+C$o mp$     dzgxytmp, dzgyztmp, dzgxztmp,
+C$o mp$     exact_psi,
+C$o mp$     exact_psix, exact_psiy, exact_psiz,
+C$o mp$     exact_psixx, exact_psiyy, exact_psizz,
+C$o mp$     exact_psixy, exact_psiyz, exact_psixz)
          do k=1,nz
             do j=1,ny
                do i=1,nx

File [modified]: initialize.F77
Delta lines: +19 -19
===================================================================
--- trunk/src/initialize.F77	2012-05-09 22:58:08 UTC (rev 273)
+++ trunk/src/initialize.F77	2012-05-25 18:18:27 UTC (rev 274)
@@ -60,25 +60,25 @@
       ny = cctk_lsh(2)
       nz = cctk_lsh(3)
 
-C$omp parallel do private(
-C$omp$     i, j, k,
-C$omp$     tt, xx, yy, zz,
-C$omp$     alpjunk, dtalpjunk, axjunk, ayjunk, azjunk, 
-C$omp$     betaxjunk, betayjunk, betazjunk,
-C$omp$     dtbetaxjunk, dtbetayjunk, dtbetazjunk,
-C$omp$     bxxjunk, bxyjunk, bxzjunk, 
-C$omp$     byxjunk, byyjunk, byzjunk, 
-C$omp$     bzxjunk, bzyjunk, bzzjunk,
-C$omp$     dxgxxjunk, dxgyyjunk, dxgzzjunk, 
-C$omp$     dxgxyjunk, dxgyzjunk, dxgxzjunk,
-C$omp$     dygxxjunk, dygyyjunk, dygzzjunk, 
-C$omp$     dygxyjunk, dygyzjunk, dygxzjunk,
-C$omp$     dzgxxjunk, dzgyyjunk, dzgzzjunk, 
-C$omp$     dzgxyjunk, dzgyzjunk, dzgxzjunk,
-C$omp$     exact_psi,
-C$omp$     exact_psix, exact_psiy, exact_psiz,
-C$omp$     exact_psixx, exact_psiyy, exact_psizz,
-C$omp$     exact_psixy, exact_psiyz, exact_psixz)
+C$o mp parallel do private(
+C$o mp$     i, j, k,
+C$o mp$     tt, xx, yy, zz,
+C$o mp$     alpjunk, dtalpjunk, axjunk, ayjunk, azjunk, 
+C$o mp$     betaxjunk, betayjunk, betazjunk,
+C$o mp$     dtbetaxjunk, dtbetayjunk, dtbetazjunk,
+C$o mp$     bxxjunk, bxyjunk, bxzjunk, 
+C$o mp$     byxjunk, byyjunk, byzjunk, 
+C$o mp$     bzxjunk, bzyjunk, bzzjunk,
+C$o mp$     dxgxxjunk, dxgyyjunk, dxgzzjunk, 
+C$o mp$     dxgxyjunk, dxgyzjunk, dxgxzjunk,
+C$o mp$     dygxxjunk, dygyyjunk, dygzzjunk, 
+C$o mp$     dygxyjunk, dygyzjunk, dygxzjunk,
+C$o mp$     dzgxxjunk, dzgyyjunk, dzgzzjunk, 
+C$o mp$     dzgxyjunk, dzgyzjunk, dzgxzjunk,
+C$o mp$     exact_psi,
+C$o mp$     exact_psix, exact_psiy, exact_psiz,
+C$o mp$     exact_psixx, exact_psiyy, exact_psizz,
+C$o mp$     exact_psixy, exact_psiyz, exact_psixz)
       do k=1,nz
          do j=1,ny
             do i=1,nx