From bcf0e34d5dfa09c7767e3419772c8aac3965112b Mon Sep 17 00:00:00 2001 From: "B.H. Baek" Date: Wed, 3 May 2017 15:44:54 -0400 Subject: [PATCH] Grwinven bug fix and temporal minor update --- src/lib/wrorlout.f | 4 ++-- src/smkinven/grwinven.f | 16 +++++++++++++++- src/temporal/temporal.f | 10 ---------- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/lib/wrorlout.f b/src/lib/wrorlout.f index c5bb2c4dc..bd175570c 100644 --- a/src/lib/wrorlout.f +++ b/src/lib/wrorlout.f @@ -401,7 +401,7 @@ SUBROUTINE WRORLOUT( RDEV, DATNAM, NREC, NPVAR, SRCID, SRCDAT, C................. Store others in temporary variables COID = STR2INT( CIFIP( S ) ) / 100000 FIP = STR2INT( CIFIP( S ) ) - COID * 100000 - SIC = CISIC( S ) + SIC = CISIC( S )(SICLEN3-3:SICLEN3) YEAR = INVYR( S ) CORS = CORIS( S ) CBLR = CBLRID( S ) @@ -519,7 +519,7 @@ SUBROUTINE WRORLOUT( RDEV, DATNAM, NREC, NPVAR, SRCID, SRCDAT, & ',', A, A ) ! onroad 93600 FORMAT( I5.5, 8( ',"',A, '"'), 4( ',', F10.2), ',', F10.4, - & ',', I4, 2( ',"',A, '"'),',', A1, + & ',', A4, 2( ',"',A, '"'),',', A1, & 2( ',', F10.5), ',', I3, ',"', A, '"', 2( ',', E13.6 ), & 2( ',', F6.2 ), ',', I2, ',', I2, 3(',"',A,'"'), A ) ! point diff --git a/src/smkinven/grwinven.f b/src/smkinven/grwinven.f index f2ffd40f2..faade34ad 100644 --- a/src/smkinven/grwinven.f +++ b/src/smkinven/grwinven.f @@ -35,7 +35,7 @@ PROGRAM GRWINVEN C........... MODULES for public variables C........... This module is the inventory arrays - USE MODSOURC, ONLY: INVYR + USE MODSOURC, ONLY: INVYR, FUGHGT, FUGWID, FUGLEN, FUGANG C........... This module contains the information about the source category USE MODINFO, ONLY: CATEGORY, CRL, CATDESC, BYEAR, @@ -589,6 +589,20 @@ PROGRAM GRWINVEN IVARNAMS( 21 ) = 'CNEIUID' IVARNAMS( 22 ) = 'CEXTORL' + ALLOCATE( FUGHGT( NSRC ), STAT=IOS ) + CALL CHECKMEM( IOS, 'FUGHGT', PROGNAME ) + ALLOCATE( FUGWID( NSRC ), STAT=IOS ) + CALL CHECKMEM( IOS, 'FUGWID', PROGNAME ) + ALLOCATE( FUGLEN( NSRC ), STAT=IOS ) + CALL CHECKMEM( IOS, 'FUGLEN', PROGNAME ) + ALLOCATE( FUGANG( NSRC ), STAT=IOS ) + CALL CHECKMEM( IOS, 'FUGANG', PROGNAME ) + + FUGHGT = 0. ! array + FUGWID = 0. ! array + FUGLEN = 0. ! array + FUGANG = 0. ! array + END SELECT C......... If area sources and XLOC and YLOC are being used, then diff --git a/src/temporal/temporal.f b/src/temporal/temporal.f index ed0090ebf..e5b592a06 100644 --- a/src/temporal/temporal.f +++ b/src/temporal/temporal.f @@ -575,16 +575,6 @@ PROGRAM TEMPORAL NGSZ = NIPPA ! No. of pollutant & emis types in each group NGRP = 1 ! Number of groups -C......... Make sure total array size is not larger than maximum - DO - IF( NSRC*NGSZ*24 >= 1024*1024*1024 ) THEN - NGRP = NGRP + 1 - NGSZ = ( NIPPA + NGRP - 1 ) / NGRP - ELSE - EXIT - END IF - END DO - DO ALLOCATE( TMAT ( NSRC, NGSZ, 24 ),