Bug-fix from David Wong, US EPA, in MODPDATA/SETUP_DECOMP() -- CJC

cjcoats · Nov 28, 2016 · c1e918d · c1e918d
1 parent 9a0118d
commit c1e918d
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 12 deletions.
diff --git a/HTML/NEWSTUFF.html b/HTML/NEWSTUFF.html
@@ -2,7 +2,7 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <HTML>
 <HEAD>
-<!-- "$Id: NEWSTUFF.html 434 2016-11-22 17:55:35Z coats $" -->
+<!-- "$Id: NEWSTUFF.html 438 2016-11-28 16:40:25Z coats $" -->
 <META NAME="MSSmartTagsPreventParsing" CONTENT="TRUE">
 <TITLE>
     What's New with the I/O&nbsp;API
@@ -16,7 +16,7 @@
       MARGINWIDTH="15">
 
     <EM>
-    $Id: NEWSTUFF.html 434 2016-11-22 17:55:35Z coats $
+    $Id: NEWSTUFF.html 438 2016-11-28 16:40:25Z coats $
     </EM>
     <HR>
 
@@ -33,6 +33,9 @@ <H2> <A NAME = "contents">
          <LI>  <A HREF = "#ncf">Notes on <VAR>netCDF-4</VAR></A>,
                <P>
 
+         <LI>  <A HREF = "#nov282016">
+               Bug fix in <CODE>MODPDATA/SETUP_DECOMP()</CODE>
+               </A>
          <LI>  <A HREF = "#sep212016">
                I/O&nbsp;API Snoop Mode
                </A>
@@ -598,6 +601,20 @@ <H2> <A NAME = "ncf">
     <P>
 
 
+<HR> <!----------------------------------------------------------------->
+
+<H2> <A NAME = "nov282016">
+    Bug fix in <CODE>MODPDATA/SETUP_DECOMP()</CODE>
+</A></H2>
+
+    <BLOCKQUOTE>
+    Subject says it.
+    </BLOCKQUOTE>
+
+    Back to <STRONG><EM><A HREF = "#contents">Contents</A></EM></STRONG>
+    <P>
+
+
 <HR> <!----------------------------------------------------------------->
 
 <H2> <A NAME = "sep212016">
@@ -6230,7 +6247,7 @@ <H2> <A NAME = "mcpl">
 
 
     <PRE>
-    $Id: NEWSTUFF.html 434 2016-11-22 17:55:35Z coats $
+    $Id: NEWSTUFF.html 438 2016-11-28 16:40:25Z coats $
     </PRE>
 </BODY>      <!--end body  -->
 </HTML>      <!--end html  -->

diff --git a/ioapi/modpdata.F90 b/ioapi/modpdata.F90
@@ -1,7 +1,7 @@
 MODULE MODPDATA
 
     !!***********************************************************************
-    !! Version "$Id: modpdata.F90 292 2016-01-02 19:54:35Z coats $"
+    !! Version "$Id: modpdata.F90 437 2016-11-28 16:37:14Z coats $"
     !! EDSS/Models-3 I/O API.
     !! Copyright (C) 2015 UNC Institute for the Environment.
     !! Distributed under the GNU LESSER GENERAL PUBLIC LICENSE version 2.1
@@ -20,6 +20,9 @@ MODULE MODPDATA
     !!
     !!      Version  12/2015 by Carlie J. Coats, Jr., UNC IE: Do list-based
     !!      read for NPCOL_NPROW-values.  Bug-fixes and changes from D.Wong.
+    !!
+    !!      Version  11/28/2015 by Carlie J. Coats, Jr., bug-fix in SETUP_DECOMP(),
+    !!      following code report from David Wong, US EPA
     !!***********************************************************************
 
     USE M3UTILIO
@@ -126,22 +129,22 @@ SUBROUTINE SETUP_DECOMP( NPROCS, NPCOL, NPROW, NCOLS, NROWS,        &
         DO R = 1, NPROW
         DO C = 1, NPCOL
             J = (R - 1) * NPCOL + C
-            NCOLS_PE( J ) = QC + MIN( RC / J, 1)
+            NCOLS_PE( J ) = QC + MIN( RC / C, 1)
             IF ( C == 1) THEN
                 COLSX_PE (1, J) = 1
             ELSE
-                COLSX_PE (1, J) = COLSX_PE (2, J-1) + 1
+                COLSX_PE (1, J) = COLSX_PE(2, J-1) + 1
             END IF
-            COLSX_PE (2, J) = COLSX_PE (1, J) + NCOLS_PE (J) -1
+            COLSX_PE (2, J) = COLSX_PE(1, J) + NCOLS_PE(J) - 1
 
-            NROWS_PE( J ) = QR + MIN( RR / J, 1)
+            NROWS_PE( J ) = QR + MIN( RR / R, 1)
             IF ( R == 1 ) THEN
-                ROWSX_PE (1, J) = 1
+                ROWSX_PE(1, J) = 1
             ELSE
                 K = J - NPCOL
-                ROWSX_PE (1, J) = ROWSX_PE (2, K) + 1
+                ROWSX_PE(1, J) = ROWSX_PE(2, K) + 1
             END IF
-            ROWSX_PE (2, J) = ROWSX_PE (1, J) + NROWS_PE( J ) - 1
+            ROWSX_PE(2, J) = ROWSX_PE(1, J) + NROWS_PE( J ) - 1
         END DO
         END DO
 
@@ -205,7 +208,7 @@ SUBROUTINE PN_SETUP()
         MESG = '"' // TRIM( PNAME ) // '":  Version'
         CALL M3MESG( MESG )
         CALL M3MESG( &
-'$Id: modpdata.F90 292 2016-01-02 19:54:35Z coats $' )
+'$Id: modpdata.F90 437 2016-11-28 16:37:14Z coats $' )
 
         CALL ENVSTR( 'NPCOL_NPROW', 'Processor decomposition: npcol x nprow', BLANK, EBUF, IERR )
         IF ( IERR .NE. 0 ) THEN