Skip to content

Commit

Permalink
deal with nonstandard classsifications
Browse files Browse the repository at this point in the history
  • Loading branch information
@dalekopera
dalekopera committed Oct 1, 2024
1 parent 457a4b1 commit d777b55
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/decode/sifdecode.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1251,7 +1251,7 @@ SUBROUTINE INTERPRET_gpsmps( &
INTEGER :: iptype, istype, ndtype, level, ijump, lineno
INTEGER :: level3, lev1, lev2, lev3, lev1s, lev2s, lev3s
INTEGER :: lev1e, lev2e, lev3e, lev1i, lev2i, lev3i, levl3a
INTEGER :: ninstr1, ninstr2, ninstr3, jstart, jstop
INTEGER :: ninstr1, ninstr2, ninstr3, jstart, jstop, hyphen
INTEGER :: used_length, new_length, min_length, alloc_status
INTEGER :: used_length2, new_length2, min_length2
INTEGER :: used_length3, new_length3, min_length3
Expand Down Expand Up @@ -1927,9 +1927,11 @@ SUBROUTINE INTERPRET_gpsmps( &
IF ( NULINE( j : j ) /= ' ' ) THEN
jstart = j
classification_start = .TRUE.
hyphen = 0
END IF
ELSE
IF ( NULINE( j : j ) == ' ' ) THEN
IF ( NULINE( j : j ) == '-' ) hyphen = hyphen + 1
IF ( NULINE( j : j ) == ' ' .OR. hyphen == 4 ) THEN
jstop = j - 1
EXIT
END IF
Expand Down

4 comments on commit d777b55

@amontoison
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nimgould Do we need the last three commits here in SIFDecode if we use the routine cutest_classification of CUTEst?
I propose to do a new release of SIFDecode if the answer if yes.

@nimgould
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I modified the sifecoder to generate an extra string in OUTSDIF.d that is then fed to CUTEst's new cutest_classification procedure. This was a user request

@amontoison
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I generated a new release such that we can specify in CUTEst that a version >= 2.6.1 of SIFDecode is required.

@nimgould
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perfect :)

Please sign in to comment.