Skip to content

Fixed some output requests, better data types #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Bruno02468 merged 2 commits into from
Jun 28, 2026
Merged

Fixed some output requests, better data types #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96a71a5
new type for storing output requests, and different logic
Bruno02468 Jun 28, 2026
21562a1
fix POST check to prevent OP2 without header
Bruno02468 Jun 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 1 addition & 14 deletions Source/LK1/L1A-CC/CC_ACCE.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ SUBROUTINE CC_ACCE ( CARD )

CHARACTER(LEN=LEN(BLNK_SUB_NAM)):: SUBR_NAME = 'CC_ACCE'
CHARACTER(LEN=*), INTENT(IN) :: CARD ! A Bulk Data card
CHARACTER( 1*BYTE) :: FOUND_PRINT ! CC_CMD_DESCRIBERS has request for "PRINT"
CHARACTER( 1*BYTE) :: FOUND_PUNCH ! CC_CMD_DESCRIBERS has request for "PUNCH"

INTEGER(LONG) :: I ! DO loop index
INTEGER(LONG) :: SETID ! Set ID on this Case Control card
Expand All @@ -57,18 +55,7 @@ SUBROUTINE CC_ACCE ( CARD )

! Check to see if BOTH, ENGR or NODE were in the ELFO request

FOUND_PRINT = 'N'
FOUND_PUNCH = 'N'
DO I=1,NCCCD
IF (CC_CMD_DESCRIBERS(I)(1:5) == 'PRINT') FOUND_PRINT = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:5) == 'PUNCH') FOUND_PUNCH = 'Y'
ENDDO

ACCE_OUT(1:) = ' '
IF ((FOUND_PRINT == 'Y') .AND. (FOUND_PUNCH == 'N')) ACCE_OUT(1:5) = 'PRINT'
IF ((FOUND_PRINT == 'N') .AND. (FOUND_PUNCH == 'Y')) ACCE_OUT(1:5) = 'PUNCH' ; PCHSTAT = 'KEEP '
IF ((FOUND_PRINT == 'Y') .AND. (FOUND_PUNCH == 'Y')) ACCE_OUT(1:4) = 'BOTH' ; PCHSTAT = 'KEEP '
IF ( ACCE_OUT(1:) == ' ') ACCE_OUT(1:5) = 'PRINT' ! Neither PRINT or PUNCH found so default to PRINT
CALL COMPUTE_OUTPUT_TARGETS(ACCE_OUT)

! Set CASE CONTROL output request variable to SETID

Expand Down
27 changes: 1 addition & 26 deletions Source/LK1/L1A-CC/CC_DISP.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@ SUBROUTINE CC_DISP ( CARD )

CHARACTER(LEN=LEN(BLNK_SUB_NAM)):: SUBR_NAME = 'CC_DISP'
CHARACTER(LEN=*), INTENT(IN) :: CARD ! A Bulk Data card
CHARACTER( 1*BYTE) :: FOUND_PRINT ! CC_CMD_DESCRIBERS has request for "PRINT"
CHARACTER( 1*BYTE) :: FOUND_PLOT ! CC_CMD_DESCRIBERS has request for "PLOT"
CHARACTER( 1*BYTE) :: FOUND_PUNCH ! CC_CMD_DESCRIBERS has request for "PUNCH"
CHARACTER( 1*BYTE) :: FOUND_NEU ! CC_CMD_DESCRIBERS has request for "NEU"
CHARACTER( 1*BYTE) :: FOUND_CSV ! CC_CMD_DESCRIBERS has request for "CSV"

INTEGER(LONG) :: I ! DO loop index
INTEGER(LONG) :: SETID ! Set ID on this Case Control card
Expand All @@ -58,27 +53,7 @@ SUBROUTINE CC_DISP ( CARD )
! (they all have some common code so it is put there)
CALL CC_OUTPUTS ( CARD, 'DISP', SETID )

! Check to see if PLOT, PRINT, PUNCH, NEU, CSV were in the request
FOUND_PRINT = 'N'
FOUND_PLOT = 'N'
FOUND_PUNCH = 'N'
FOUND_NEU = 'N'
FOUND_CSV = 'N'
DO I=1,NCCCD
IF (CC_CMD_DESCRIBERS(I)(1:5) == 'PRINT') FOUND_PRINT = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:4) == 'PLOT') FOUND_PLOT = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:5) == 'PUNCH') FOUND_PUNCH = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:3) == 'NEU') FOUND_NEU = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:3) == 'CSV') FOUND_CSV = 'Y'
ENDDO
! concatenate the strings
DISP_OUT = TRIM(FOUND_PRINT) // TRIM(FOUND_PLOT) // TRIM(FOUND_PUNCH) // TRIM(FOUND_NEU) // TRIM(FOUND_CSV)

! default to print
IF (DISP_OUT(1:5) == 'NNNNN') THEN
DISP_OUT = 'YNNNN'
ENDIF

CALL COMPUTE_OUTPUT_TARGETS(DISP_OUT)

! Set CASE CONTROL output request variable to SETID
IF (NSUB == 0) THEN
Expand Down
25 changes: 1 addition & 24 deletions Source/LK1/L1A-CC/CC_ELFO.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@ SUBROUTINE CC_ELFO ( CARD )

CHARACTER(LEN=LEN(BLNK_SUB_NAM)):: SUBR_NAME = 'CC_ELFO'
CHARACTER(LEN=*), INTENT(IN) :: CARD ! A Bulk Data card
CHARACTER( 1*BYTE) :: FOUND_PRINT ! CC_CMD_DESCRIBERS has request for "PRINT"
CHARACTER( 1*BYTE) :: FOUND_PLOT ! CC_CMD_DESCRIBERS has request for "PLOT"
CHARACTER( 1*BYTE) :: FOUND_PUNCH ! CC_CMD_DESCRIBERS has request for "PUNCH"
CHARACTER( 1*BYTE) :: FOUND_NEU ! CC_CMD_DESCRIBERS has request for "NEU"
CHARACTER( 1*BYTE) :: FOUND_CSV ! CC_CMD_DESCRIBERS has request for "CSV"

CHARACTER( 1*BYTE) :: FOUND_BOTH ! CC_CMD_DESCRIBERS has request for "BOTH"
CHARACTER( 1*BYTE) :: FOUND_ENGR ! CC_CMD_DESCRIBERS has request for "ENGR"
Expand All @@ -60,36 +55,18 @@ SUBROUTINE CC_ELFO ( CARD )
! CC_OUTPUTS processes all output type Case Control entries (they all have some common code so it is put there)
CALL CC_OUTPUTS ( CARD, 'ELFO', SETID )

! Check to see if PLOT, PRINT, PUNCH, NEU, CSV were in the request
FOUND_PRINT = 'N'
FOUND_PLOT = 'N'
FOUND_PUNCH = 'N'
FOUND_NEU = 'N'
FOUND_CSV = 'N'

! Check to see if BOTH, ENGR or NODE were in the ELFO request
FOUND_BOTH = 'N'
FOUND_ENGR = 'N'
FOUND_NODE = 'N'
DO I=1,NCCCD
IF (CC_CMD_DESCRIBERS(I)(1:5) == 'PRINT') FOUND_PRINT = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:4) == 'PLOT') FOUND_PLOT = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:5) == 'PUNCH') FOUND_PUNCH = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:3) == 'NEU') FOUND_NEU = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:3) == 'CSV') FOUND_CSV = 'Y'

IF (CC_CMD_DESCRIBERS(I)(1:4) == 'BOTH') FOUND_BOTH = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:4) == 'ENGR') FOUND_ENGR = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:4) == 'NODE') FOUND_NODE = 'Y'
ENDDO

! concatenate the strings
FORC_OUT = TRIM(FOUND_PRINT) // TRIM(FOUND_PLOT) // TRIM(FOUND_PUNCH) // TRIM(FOUND_NEU) // TRIM(FOUND_CSV)

! default to print
IF (FORC_OUT(1:5) == 'NNNNN') THEN
FORC_OUT = 'YNNNN'
ENDIF
CALL COMPUTE_OUTPUT_TARGETS(FORC_OUT)


! Set CASE CONTROL output request variable to SETID
Expand Down
26 changes: 1 addition & 25 deletions Source/LK1/L1A-CC/CC_GPFO.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,6 @@ SUBROUTINE CC_GPFO ( CARD )

CHARACTER(LEN=LEN(BLNK_SUB_NAM)):: SUBR_NAME = 'CC_GPFO'
CHARACTER(LEN=*), INTENT(IN) :: CARD ! A Bulk Data card
CHARACTER( 1*BYTE) :: FOUND_PRINT ! CC_CMD_DESCRIBERS has request for "PRINT"
CHARACTER( 1*BYTE) :: FOUND_PLOT ! CC_CMD_DESCRIBERS has request for "PLOT"
CHARACTER( 1*BYTE) :: FOUND_PUNCH ! CC_CMD_DESCRIBERS has request for "PUNCH"
CHARACTER( 1*BYTE) :: FOUND_NEU ! CC_CMD_DESCRIBERS has request for "NEU"
CHARACTER( 1*BYTE) :: FOUND_CSV ! CC_CMD_DESCRIBERS has request for "CSV"

INTEGER(LONG) :: I ! DO loop index
INTEGER(LONG) :: SETID ! Set ID on this Case Control card
Expand All @@ -56,26 +51,7 @@ SUBROUTINE CC_GPFO ( CARD )
! (they all have some common code so it is put there)
CALL CC_OUTPUTS ( CARD, 'GPFO', SETID )

! Check to see if PLOT, PRINT, PUNCH, NEU, CSV were in the request
FOUND_PRINT = 'N'
FOUND_PLOT = 'N'
FOUND_PUNCH = 'N'
FOUND_NEU = 'N'
FOUND_CSV = 'N'
DO I=1,NCCCD
IF (CC_CMD_DESCRIBERS(I)(1:5) == 'PRINT') FOUND_PRINT = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:4) == 'PLOT') FOUND_PLOT = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:5) == 'PUNCH') FOUND_PUNCH = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:3) == 'NEU') FOUND_NEU = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:3) == 'CSV') FOUND_CSV = 'Y'
ENDDO
! concatenate the strings
GPFO_OUT = TRIM(FOUND_PRINT) // TRIM(FOUND_PLOT) // TRIM(FOUND_PUNCH) // TRIM(FOUND_NEU) // TRIM(FOUND_CSV)

! default to print
IF (GPFO_OUT(1:5) == 'NNNNN') THEN
GPFO_OUT = 'YNNNN'
ENDIF
CALL COMPUTE_OUTPUT_TARGETS(GPFO_OUT)

! Set CASE CONTROL output request variable to SETID
IF (NSUB == 0) THEN
Expand Down
26 changes: 1 addition & 25 deletions Source/LK1/L1A-CC/CC_MPCF.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@ SUBROUTINE CC_MPCF ( CARD )

CHARACTER(LEN=LEN(BLNK_SUB_NAM)):: SUBR_NAME = 'CC_MPCF'
CHARACTER(LEN=*), INTENT(IN) :: CARD ! A Bulk Data card
CHARACTER( 1*BYTE) :: FOUND_PRINT ! CC_CMD_DESCRIBERS has request for "PRINT"
CHARACTER( 1*BYTE) :: FOUND_PLOT ! CC_CMD_DESCRIBERS has request for "PLOT"
CHARACTER( 1*BYTE) :: FOUND_PUNCH ! CC_CMD_DESCRIBERS has request for "PUNCH"
CHARACTER( 1*BYTE) :: FOUND_NEU ! CC_CMD_DESCRIBERS has request for "NEU"
CHARACTER( 1*BYTE) :: FOUND_CSV ! CC_CMD_DESCRIBERS has request for "CSV"

INTEGER(LONG) :: I ! DO loop index
INTEGER(LONG) :: SETID ! Set ID on this Case Control card
Expand All @@ -58,26 +53,7 @@ SUBROUTINE CC_MPCF ( CARD )
! (they all have some common code so it is put there)
CALL CC_OUTPUTS ( CARD, 'MPCF', SETID )

! Check to see if PLOT, PRINT, PUNCH, NEU, CSV were in the request
FOUND_PRINT = 'N'
FOUND_PLOT = 'N'
FOUND_PUNCH = 'N'
FOUND_NEU = 'N'
FOUND_CSV = 'N'
DO I=1,NCCCD
IF (CC_CMD_DESCRIBERS(I)(1:5) == 'PRINT') FOUND_PRINT = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:4) == 'PLOT') FOUND_PLOT = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:5) == 'PUNCH') FOUND_PUNCH = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:3) == 'NEU') FOUND_NEU = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:3) == 'CSV') FOUND_CSV = 'Y'
ENDDO
! concatenate the strings
MPCF_OUT = TRIM(FOUND_PRINT) // TRIM(FOUND_PLOT) // TRIM(FOUND_PUNCH) // TRIM(FOUND_NEU) // TRIM(FOUND_CSV)

! default to print
IF (MPCF_OUT(1:5) == 'NNNNN') THEN
MPCF_OUT = 'YNNNN'
ENDIF
CALL COMPUTE_OUTPUT_TARGETS(MPCF_OUT)


! Set CASE CONTROL output request variable to SETID
Expand Down
26 changes: 1 addition & 25 deletions Source/LK1/L1A-CC/CC_OLOA.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@ SUBROUTINE CC_OLOA ( CARD )

CHARACTER(LEN=LEN(BLNK_SUB_NAM)):: SUBR_NAME = 'CC_OLOA'
CHARACTER(LEN=*), INTENT(IN) :: CARD ! A Bulk Data card
CHARACTER( 1*BYTE) :: FOUND_PRINT ! CC_CMD_DESCRIBERS has request for "PRINT"
CHARACTER( 1*BYTE) :: FOUND_PLOT ! CC_CMD_DESCRIBERS has request for "PLOT"
CHARACTER( 1*BYTE) :: FOUND_PUNCH ! CC_CMD_DESCRIBERS has request for "PUNCH"
CHARACTER( 1*BYTE) :: FOUND_NEU ! CC_CMD_DESCRIBERS has request for "NEU"
CHARACTER( 1*BYTE) :: FOUND_CSV ! CC_CMD_DESCRIBERS has request for "CSV"

INTEGER(LONG) :: I ! DO loop index
INTEGER(LONG) :: SETID ! Set ID on this Case Control card
Expand All @@ -58,26 +53,7 @@ SUBROUTINE CC_OLOA ( CARD )
! (they all have some common code so it is put there)
CALL CC_OUTPUTS ( CARD, 'OLOA', SETID )

! Check to see if PLOT, PRINT, PUNCH, NEU, CSV were in the request
FOUND_PRINT = 'N'
FOUND_PLOT = 'N'
FOUND_PUNCH = 'N'
FOUND_NEU = 'N'
FOUND_CSV = 'N'
DO I=1,NCCCD
IF (CC_CMD_DESCRIBERS(I)(1:5) == 'PRINT') FOUND_PRINT = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:4) == 'PLOT') FOUND_PLOT = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:5) == 'PUNCH') FOUND_PUNCH = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:3) == 'NEU') FOUND_NEU = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:3) == 'CSV') FOUND_CSV = 'Y'
ENDDO
! concatenate the strings
OLOA_OUT = TRIM(FOUND_PRINT) // TRIM(FOUND_PLOT) // TRIM(FOUND_PUNCH) // TRIM(FOUND_NEU) // TRIM(FOUND_CSV)

! default to print
IF (OLOA_OUT(1:5) == 'NNNNN') THEN
OLOA_OUT = 'YNNNN'
ENDIF
CALL COMPUTE_OUTPUT_TARGETS(OLOA_OUT)


! Set CASE CONTROL output request variable to SETID
Expand Down
26 changes: 1 addition & 25 deletions Source/LK1/L1A-CC/CC_SPCF.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@ SUBROUTINE CC_SPCF ( CARD )

CHARACTER(LEN=LEN(BLNK_SUB_NAM)):: SUBR_NAME = 'CC_SPCF'
CHARACTER(LEN=*), INTENT(IN) :: CARD ! A Bulk Data card
CHARACTER( 1*BYTE) :: FOUND_PRINT ! CC_CMD_DESCRIBERS has request for "PRINT"
CHARACTER( 1*BYTE) :: FOUND_PLOT ! CC_CMD_DESCRIBERS has request for "PLOT"
CHARACTER( 1*BYTE) :: FOUND_PUNCH ! CC_CMD_DESCRIBERS has request for "PUNCH"
CHARACTER( 1*BYTE) :: FOUND_NEU ! CC_CMD_DESCRIBERS has request for "NEU"
CHARACTER( 1*BYTE) :: FOUND_CSV ! CC_CMD_DESCRIBERS has request for "CSV"

INTEGER(LONG) :: I ! DO loop index
INTEGER(LONG) :: SETID ! Set ID on this Case Control card
Expand All @@ -58,26 +53,7 @@ SUBROUTINE CC_SPCF ( CARD )
! (they all have some common code so it is put there)
CALL CC_OUTPUTS ( CARD, 'SPCF', SETID )

! Check to see if PLOT, PRINT, PUNCH, NEU, CSV were in the request
FOUND_PRINT = 'N'
FOUND_PLOT = 'N'
FOUND_PUNCH = 'N'
FOUND_NEU = 'N'
FOUND_CSV = 'N'
DO I=1,NCCCD
IF (CC_CMD_DESCRIBERS(I)(1:5) == 'PRINT') FOUND_PRINT = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:4) == 'PLOT') FOUND_PLOT = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:5) == 'PUNCH') FOUND_PUNCH = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:3) == 'NEU') FOUND_NEU = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:3) == 'CSV') FOUND_CSV = 'Y'
ENDDO
! concatenate the strings
SPCF_OUT = TRIM(FOUND_PRINT) // TRIM(FOUND_PLOT) // TRIM(FOUND_PUNCH) // TRIM(FOUND_NEU) // TRIM(FOUND_CSV)

! default to print
IF (SPCF_OUT(1:5) == 'NNNNN') THEN
SPCF_OUT = 'YNNNN'
ENDIF
CALL COMPUTE_OUTPUT_TARGETS(SPCF_OUT)


! Set CASE CONTROL output request variable to SETID
Expand Down
26 changes: 1 addition & 25 deletions Source/LK1/L1A-CC/CC_STRE.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,6 @@ SUBROUTINE CC_STRE ( CARD )

CHARACTER(LEN=LEN(BLNK_SUB_NAM)):: SUBR_NAME = 'CC_STRE'
CHARACTER(LEN=*), INTENT(IN) :: CARD ! A Bulk Data card
CHARACTER( 1*BYTE) :: FOUND_PRINT ! CC_CMD_DESCRIBERS has request for "PRINT"
CHARACTER( 1*BYTE) :: FOUND_PLOT ! CC_CMD_DESCRIBERS has request for "PLOT"
CHARACTER( 1*BYTE) :: FOUND_PUNCH ! CC_CMD_DESCRIBERS has request for "PUNCH"
CHARACTER( 1*BYTE) :: FOUND_NEU ! CC_CMD_DESCRIBERS has request for "NEU"
CHARACTER( 1*BYTE) :: FOUND_CSV ! CC_CMD_DESCRIBERS has request for "CSV"

INTEGER(LONG) :: I ! DO loop index
INTEGER(LONG) :: SETID ! Set ID on this Case Control card
Expand All @@ -57,26 +52,7 @@ SUBROUTINE CC_STRE ( CARD )

CALL CC_OUTPUTS ( CARD, 'STRE', SETID )

! Check to see if PLOT, PRINT, PUNCH, NEU, CSV were in the request
FOUND_PRINT = 'N'
FOUND_PLOT = 'N'
FOUND_PUNCH = 'N'
FOUND_NEU = 'N'
FOUND_CSV = 'N'
DO I=1,NCCCD
IF (CC_CMD_DESCRIBERS(I)(1:5) == 'PRINT') FOUND_PRINT = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:4) == 'PLOT') FOUND_PLOT = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:5) == 'PUNCH') FOUND_PUNCH = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:3) == 'NEU') FOUND_NEU = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:3) == 'CSV') FOUND_CSV = 'Y'
ENDDO
! concatenate the strings
STRE_OUT = TRIM(FOUND_PRINT) // TRIM(FOUND_PLOT) // TRIM(FOUND_PUNCH) // TRIM(FOUND_NEU) // TRIM(FOUND_CSV)

! default to print
IF (STRE_OUT(1:5) == 'NNNNN') THEN
STRE_OUT = 'YNNNN'
ENDIF
CALL COMPUTE_OUTPUT_TARGETS(STRE_OUT)

! Set CASE CONTROL output request variable to SETID
IF (NSUB == 0) THEN
Expand Down
26 changes: 1 addition & 25 deletions Source/LK1/L1A-CC/CC_STRN.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,6 @@ SUBROUTINE CC_STRN ( CARD )

CHARACTER(LEN=LEN(BLNK_SUB_NAM)):: SUBR_NAME = 'CC_STRN'
CHARACTER(LEN=*), INTENT(IN) :: CARD ! A Bulk Data card
CHARACTER( 1*BYTE) :: FOUND_PRINT ! CC_CMD_DESCRIBERS has request for "PRINT"
CHARACTER( 1*BYTE) :: FOUND_PLOT ! CC_CMD_DESCRIBERS has request for "PLOT"
CHARACTER( 1*BYTE) :: FOUND_PUNCH ! CC_CMD_DESCRIBERS has request for "PUNCH"
CHARACTER( 1*BYTE) :: FOUND_NEU ! CC_CMD_DESCRIBERS has request for "NEU"
CHARACTER( 1*BYTE) :: FOUND_CSV ! CC_CMD_DESCRIBERS has request for "CSV"

INTEGER(LONG) :: I ! DO loop index
INTEGER(LONG) :: SETID ! Set ID on this Case Control card
Expand All @@ -57,26 +52,7 @@ SUBROUTINE CC_STRN ( CARD )

CALL CC_OUTPUTS ( CARD, 'STRN', SETID )

! Check to see if PLOT, PRINT, PUNCH, NEU, CSV were in the request
FOUND_PRINT = 'N'
FOUND_PLOT = 'N'
FOUND_PUNCH = 'N'
FOUND_NEU = 'N'
FOUND_CSV = 'N'
DO I=1,NCCCD
IF (CC_CMD_DESCRIBERS(I)(1:5) == 'PRINT') FOUND_PRINT = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:4) == 'PLOT') FOUND_PLOT = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:5) == 'PUNCH') FOUND_PUNCH = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:3) == 'NEU') FOUND_NEU = 'Y'
IF (CC_CMD_DESCRIBERS(I)(1:3) == 'CSV') FOUND_CSV = 'Y'
ENDDO
! concatenate the strings
STRN_OUT = TRIM(FOUND_PRINT) // TRIM(FOUND_PLOT) // TRIM(FOUND_PUNCH) // TRIM(FOUND_NEU) // TRIM(FOUND_CSV)

! default to print
IF (STRN_OUT(1:5) == 'NNNNN') THEN
STRN_OUT = 'YNNNN'
ENDIF
CALL COMPUTE_OUTPUT_TARGETS(STRN_OUT)

! Set CASE CONTROL output request variable to SETID
IF (NSUB == 0) THEN
Expand Down
Loading
Loading