From bbabe3a4159726298a15c98598e4855e7b57d115 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Fri, 10 May 2024 17:17:49 +0000 Subject: [PATCH] hard code BIN2NC switch for demonstration purposes --- model/src/gx_outp.F90 | 24 ++++++++++++------------ model/src/w3iopomd.F90 | 4 ++-- model/src/w3wavemd.F90 | 16 ++++++++-------- model/src/wmiopomd.F90 | 16 ++++++++-------- model/src/ww3_ounp.F90 | 40 ++++++++++++++++++++-------------------- model/src/ww3_outp.F90 | 32 ++++++++++++++++---------------- 6 files changed, 66 insertions(+), 66 deletions(-) diff --git a/model/src/gx_outp.F90 b/model/src/gx_outp.F90 index 8dce5f4d0..df24dc7a2 100644 --- a/model/src/gx_outp.F90 +++ b/model/src/gx_outp.F90 @@ -165,11 +165,11 @@ PROGRAM GXOUTP #endif USE W3ODATMD, ONLY: W3SETO, W3NOUT USE W3IOGRMD, ONLY: W3IOGR -#ifdef W3_BIN2NC +!#ifdef W3_BIN2NC USE W3IOPOMD, ONLY: W3IOPON -#else - USE W3IOPOMD, ONLY: W3IOPO -#endif +!#else +! USE W3IOPOMD, ONLY: W3IOPO +!#endif USE W3SERVMD, ONLY : ITRACE, NEXTLN, EXTCDE #ifdef W3_S USE W3SERVMD, ONLY : STRACE @@ -281,11 +281,11 @@ PROGRAM GXOUTP !--- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ! 3. Read general data and first fields from file ! -#ifdef W3_BIN2NC +!#ifdef W3_BIN2NC CALL W3IOPON ( 'READ', NDSOP, IOTEST ) -#else - CALL W3IOPO ( 'READ', NDSOP, IOTEST ) -#endif +!#else +! CALL W3IOPO ( 'READ', NDSOP, IOTEST ) +!#endif ALLOCATE ( FLREQ(NOPTS) ) ! WRITE (NDSO,930) @@ -377,11 +377,11 @@ PROGRAM GXOUTP DO DTEST = DSEC21 ( TIME , TOUT ) IF ( DTEST .GT. 0. ) THEN -#ifdef W3_BIN2NC +!#ifdef W3_BIN2NC CALL W3IOPON ( 'READ', NDSOP, IOTEST ) -#else - CALL W3IOPO ( 'READ', NDSOP, IOTEST ) -#endif +!#else +! CALL W3IOPO ( 'READ', NDSOP, IOTEST ) +!#endif IF ( IOTEST .EQ. -1 ) THEN WRITE (NDSO,998) EXIT diff --git a/model/src/w3iopomd.F90 b/model/src/w3iopomd.F90 index a4b55cbb9..76a9b831e 100644 --- a/model/src/w3iopomd.F90 +++ b/model/src/w3iopomd.F90 @@ -1109,7 +1109,7 @@ SUBROUTINE W3IOPE ( A ) !/ END SUBROUTINE W3IOPE -#ifdef W3_BIN2NC +!#ifdef W3_BIN2NC !> Handle netCDF return code. !> !> @param errcode NetCDF error code. 0 for no error. @@ -1784,7 +1784,7 @@ SUBROUTINE W3IOPON ( INXOUT, NDSOP, IOTST, IMOD) 900 FORMAT (/' *** WAVEWATCH III ERROR IN W3IOPO :'/ & ' ILEGAL INXOUT VALUE: ',A/) END SUBROUTINE W3IOPON -#endif +!#endif !/ ------------------------------------------------------------------- / !> Read or write point output. !> diff --git a/model/src/w3wavemd.F90 b/model/src/w3wavemd.F90 index 6db2f03af..350d1fd5b 100644 --- a/model/src/w3wavemd.F90 +++ b/model/src/w3wavemd.F90 @@ -2601,15 +2601,15 @@ SUBROUTINE W3WAVE ( IMOD, ODAT, TEND, STAMP, NO_OUT & ! Gets the necessary spectral data ! CALL W3IOPE ( VA ) -#ifdef W3_BIN2NC +!#ifdef W3_BIN2NC CALL W3IOPON ( 'WRITE', NDS(8), ITEST, IMOD ) -#else - CALL W3IOPO ( 'WRITE', NDS(8), ITEST, IMOD & -#ifdef W3_ASCII - ,NDS(15) & -#endif - ) -#endif +!#else +! CALL W3IOPO ( 'WRITE', NDS(8), ITEST, IMOD & +!#ifdef W3_ASCII +! ,NDS(15) & +!#endif +! ) +!#endif END IF ! ELSE IF ( J .EQ. 3 ) THEN diff --git a/model/src/wmiopomd.F90 b/model/src/wmiopomd.F90 index bce460483..ac1fcd56b 100644 --- a/model/src/wmiopomd.F90 +++ b/model/src/wmiopomd.F90 @@ -1175,15 +1175,15 @@ SUBROUTINE WMIOPO ( TOUT ) ! TIME = TOUT ! -#ifdef W3_BIN2NC +!#ifdef W3_BIN2NC CALL W3IOPON ( 'WRITE', MDSUP, II, 0) -#else - CALL W3IOPO ( 'WRITE', MDSUP, II, 0 & -#ifdef W3_ASCII - ,MDSUPA & -#endif - ) -#endif +!#else +! CALL W3IOPO ( 'WRITE', MDSUP, II, 0 & +!#ifdef W3_ASCII +! ,MDSUPA & +!#endif +! ) +!#endif ! RETURN ! diff --git a/model/src/ww3_ounp.F90 b/model/src/ww3_ounp.F90 index a1533c73b..a66c6f175 100644 --- a/model/src/ww3_ounp.F90 +++ b/model/src/ww3_ounp.F90 @@ -387,11 +387,11 @@ PROGRAM W3OUNP !--- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ! 3. Read general data and first fields from file ! -#if W3_BIN2NC +!#if W3_BIN2NC CALL W3IOPON ( 'READ', NDSOP, IOTEST ) -#else - CALL W3IOPO ( 'READ', NDSOP, IOTEST ) -#endif +!#else +! CALL W3IOPO ( 'READ', NDSOP, IOTEST ) +!#endif ! IF ( IAPROC .EQ. NAPOUT ) WRITE (NDSO,930) DO I=1, NOPTS @@ -608,11 +608,11 @@ PROGRAM W3OUNP DO WHILE (DTEST.NE.0) DTEST = DSEC21 ( TIME , TOUT ) IF ( DTEST .GT. 0. ) THEN -#ifdef W3_BIN2NC +!#ifdef W3_BIN2NC CALL W3IOPON ( 'READ', NDSOP, IOTEST ) -#else - CALL W3IOPO ( 'READ', NDSOP, IOTEST ) -#endif +!#else +! CALL W3IOPO ( 'READ', NDSOP, IOTEST ) +!#endif IF ( IOTEST .EQ. -1 ) THEN IF ( IAPROC .EQ. NAPOUT ) WRITE (NDSO,949) GOTO 888 @@ -1078,11 +1078,11 @@ PROGRAM W3OUNP DTEST = DSEC21 ( TIME , TOUT ) IF ( DTEST .GT. 0. ) THEN ! reads TIME from out_pnt.ww3 -#ifdef W3_BIN2NC +!#ifdef W3_BIN2NC CALL W3IOPON ( 'READ', NDSOP, IOTEST ) -#else - CALL W3IOPO ( 'READ', NDSOP, IOTEST ) -#endif +!#else +! CALL W3IOPO ( 'READ', NDSOP, IOTEST ) +!#endif IF ( IOTEST .EQ. -1 ) THEN IF ( IAPROC .EQ. NAPOUT ) WRITE (NDSO,949) GOTO 700 @@ -1227,11 +1227,11 @@ PROGRAM W3OUNP ! 7.3 Reinitiazes TIME (close open out_pnt.ww3) and TOUT to process a new bunch of stations CLOSE(NDSOP) ! closes binary file out_pnt* IPASS = 0 ! resets time counter for binary file out_pnt* -#ifdef W3_BIN2NC +!#ifdef W3_BIN2NC CALL W3IOPON ( 'READ', NDSOP, IOTEST ) -#else - CALL W3IOPO ( 'READ', NDSOP, IOTEST ) -#endif +!#else +! CALL W3IOPO ( 'READ', NDSOP, IOTEST ) +!#endif #ifdef W3_T WRITE(NDSE,*) 'out_pnt* closed and reopened' #endif @@ -1244,11 +1244,11 @@ PROGRAM W3OUNP DO WHILE (DTEST.NE.0) DTEST = DSEC21 ( TIME , TOUT ) IF ( DTEST .GT. 0. ) THEN -#ifdef W3_BIN2NC +!#ifdef W3_BIN2NC CALL W3IOPON ( 'READ', NDSOP, IOTEST ) -#else - CALL W3IOPO ( 'READ', NDSOP, IOTEST ) -#endif +!#else +! CALL W3IOPO ( 'READ', NDSOP, IOTEST ) +!#endif IF ( IOTEST .EQ. -1 ) THEN IF ( IAPROC .EQ. NAPOUT ) WRITE (NDSO,949) GOTO 700 diff --git a/model/src/ww3_outp.F90 b/model/src/ww3_outp.F90 index d793783ca..8876969c0 100644 --- a/model/src/ww3_outp.F90 +++ b/model/src/ww3_outp.F90 @@ -208,11 +208,11 @@ PROGRAM W3OUTP #endif USE W3ODATMD, ONLY: W3SETO, W3NOUT USE W3IOGRMD, ONLY: W3IOGR -#ifdef W3_BIN2NC +!#ifdef W3_BIN2NC USE W3IOPOMD, ONLY: W3IOPON, W3IOPON_READ, W3IOPON_WRITE -#else - USE W3IOPOMD, ONLY: W3IOPO -#endif +!#else +! USE W3IOPOMD, ONLY: W3IOPO +!#endif USE W3SERVMD, ONLY : ITRACE, NEXTLN, EXTCDE #ifdef W3_S USE W3SERVMD, ONLY : STRACE @@ -362,11 +362,11 @@ PROGRAM W3OUTP !--- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ! 3. Read general data and first fields from file ! -#if W3_BIN2NC +!#if W3_BIN2NC CALL W3IOPON ( 'READ', NDSOP, IOTEST ) -#else - CALL W3IOPO ( 'READ', NDSOP, IOTEST ) -#endif +!#else +! CALL W3IOPO ( 'READ', NDSOP, IOTEST ) +!#endif ! WRITE (NDSO,930) DO I=1, NOPTS @@ -464,11 +464,11 @@ PROGRAM W3OUTP DO CALL STME21 ( TIME , IDTIME ) WRITE (NDSO,948) IDTIME -#ifdef W3_BIN2NC +!#ifdef W3_BIN2NC CALL W3IOPON ( 'READ', NDSOP, IOTEST ) -#else - CALL W3IOPO ( 'READ', NDSOP, IOTEST ) -#endif +!#else +! CALL W3IOPO ( 'READ', NDSOP, IOTEST ) +!#endif IF ( IOTEST .EQ. -1 ) THEN WRITE (NDSO,949) GOTO 888 @@ -788,11 +788,11 @@ PROGRAM W3OUTP DO DTEST = DSEC21 ( TIME , TOUT ) IF ( DTEST .GT. 0. ) THEN -#ifdef W3_BIN2NC +!#ifdef W3_BIN2NC CALL W3IOPON ( 'READ', NDSOP, IOTEST ) -#else - CALL W3IOPO ( 'READ', NDSOP, IOTEST ) -#endif +!#else +! CALL W3IOPO ( 'READ', NDSOP, IOTEST ) +!#endif IF ( IOTEST .EQ. -1 ) THEN WRITE (NDSO,949) EXIT