From 3876d0b8e33d23e2c039fd1478dc1403270f5784 Mon Sep 17 00:00:00 2001 From: Ian P King Date: Sat, 10 Aug 2019 17:41:40 +1000 Subject: [PATCH] LATER FIXUP --- RMA10PRP/DUMMY.R10 | 6 +++++- RMA10PRP/SRC/FORMFILE.F90 | 11 +++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/RMA10PRP/DUMMY.R10 b/RMA10PRP/DUMMY.R10 index acfebe6..e58b7e5 100644 --- a/RMA10PRP/DUMMY.R10 +++ b/RMA10PRP/DUMMY.R10 @@ -2,7 +2,6 @@ INBNGEO MESH.GEO OUTFIL RESULTS.OUT & Output ASCII results OUTBNRMA BRESULTS.RMA & Output binary file with new format results data ENDFIL -MAXLAY 20 ENDLIMIT TI STARTIM & Starting date and time @@ -65,7 +64,12 @@ CONV-DEP 0.00100 & Convergen CONV-SAL 0.01000 & Convergence limit for salinity CONV-TMP 0.01000 & Convergence limit for temperature CONV-SED 0.01000 & Convergence limit for sediment concentration + Continuity lines for selective output +CCLINOUT 1 4 5 CONT-FLW & Save flows in continuity line output +CONT-ELV & Save average water surface elevations in continuity line output +CONT-TMP & Save average temperature in continuity line output +CONT-SED & Save average sediment concentration in continuity line output EDDY-MAT 1 -0.20000 & Horizontal turbulent eddy coefficient EDDY-VRT 1 0.000E+00 & Vertical turbulent eddy coefficient DIFF-MAT 1 0.00000 & Horizontal turbulent diffusion coefficient diff --git a/RMA10PRP/SRC/FORMFILE.F90 b/RMA10PRP/SRC/FORMFILE.F90 index 385b970..6efaf5e 100644 --- a/RMA10PRP/SRC/FORMFILE.F90 +++ b/RMA10PRP/SRC/FORMFILE.F90 @@ -622,13 +622,16 @@ DATA HELPINT/& WRITE(DATALIN(LINE),60651) TRANSIT,helpint(71) 60651 FORMAT('TRANSIT',3X,F8.5,t70,a96) ENDIF - IF(JCSPLPT .GT. 0) THEN + IF(ICTOTC .GT. 0) THEN LINE=LINE+1 - WRITE(DATALIN(LINE),6066) (NCSPLPT(J),J=1,JCSPLPT) -6066 FORMAT(40X,'Continuity lines for selective output'/'CCLINOUT',20I7) + WRITE(DATALIN(LINE),6066) + LINE=LINE+1 + WRITE(DATALIN(LINE),60661) (NCSPLPT(J),J=1,ICTOTC) +6066 FORMAT(40X,'& Continuity lines for selective output') +60661 FORMAT('CCLINOUT',20I7) ENDIF - DO J=1,ICTOTC + DO J=1,6 IF(ICCOMP(J) .EQ. 1) THEN LINE=LINE+1 WRITE(DATALIN(LINE),6067) helpint(72)