Skip to content

Commit

Permalink
Update qpa.F90
Browse files Browse the repository at this point in the history
  • Loading branch information
amontoison authored and nimgould committed Dec 18, 2024
1 parent 7e88d74 commit 82032a1
Showing 1 changed file with 19 additions and 19 deletions.
38 changes: 19 additions & 19 deletions src/qpa/qpa.F90
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
! THIS VERSION: GALAHAD 5.1 - 2024-10-04 AT 14:00 GMT.
! THIS VERSION: GALAHAD 5.1 - 2024-12-18 AT 10:40 GMT.

#include "galahad_modules.h"

Expand Down Expand Up @@ -12855,11 +12855,11 @@ SUBROUTINE QPA_solve_qp( data, status, H_val, G, f, A_val, C_l, C_u, &

! save the linear term of the objective function

IF ( COUNT( G( : n ) == 0.0_rp_ ) == n ) THEN
data%prob%gradient_kind = 0
ELSE IF ( COUNT( G( : n ) == 1.0_rp_ ) == n ) THEN
data%prob%gradient_kind = 1
ELSE
! IF ( COUNT( G( : n ) == 0.0_rp_ ) == n ) THEN
! data%prob%gradient_kind = 0
! ELSE IF ( COUNT( G( : n ) == 1.0_rp_ ) == n ) THEN
! data%prob%gradient_kind = 1
! ELSE
data%prob%gradient_kind = 2
array_name = 'qpa: data%prob%G'
CALL SPACE_resize_array( n, data%prob%G, &
Expand All @@ -12872,7 +12872,7 @@ SUBROUTINE QPA_solve_qp( data, status, H_val, G, f, A_val, C_l, C_u, &
out = data%qpa_control%error )
IF ( data%qpa_inform%status /= 0 ) GO TO 900
data%prob%G( : n ) = G( : n )
END IF
! END IF

! save the lower and upper simple bounds

Expand Down Expand Up @@ -13071,11 +13071,11 @@ SUBROUTINE QPA_solve_l1qp( data, status, H_val, G, f, rho_g, rho_b, &

! save the linear term of the objective function

IF ( COUNT( G( : n ) == 0.0_rp_ ) == n ) THEN
data%prob%gradient_kind = 0
ELSE IF ( COUNT( G( : n ) == 1.0_rp_ ) == n ) THEN
data%prob%gradient_kind = 1
ELSE
! IF ( COUNT( G( : n ) == 0.0_rp_ ) == n ) THEN
! data%prob%gradient_kind = 0
! ELSE IF ( COUNT( G( : n ) == 1.0_rp_ ) == n ) THEN
! data%prob%gradient_kind = 1
! ELSE
data%prob%gradient_kind = 2
array_name = 'qpa: data%prob%G'
CALL SPACE_resize_array( n, data%prob%G, &
Expand All @@ -13088,7 +13088,7 @@ SUBROUTINE QPA_solve_l1qp( data, status, H_val, G, f, rho_g, rho_b, &
out = data%qpa_control%error )
IF ( data%qpa_inform%status /= 0 ) GO TO 900
data%prob%G( : n ) = G( : n )
END IF
! END IF

! save the lower and upper simple bounds

Expand Down Expand Up @@ -13274,11 +13274,11 @@ SUBROUTINE QPA_solve_bcl1qp( data, status, H_val, G, f, rho_g, &

! save the linear term of the objective function

IF ( COUNT( G( : n ) == 0.0_rp_ ) == n ) THEN
data%prob%gradient_kind = 0
ELSE IF ( COUNT( G( : n ) == 1.0_rp_ ) == n ) THEN
data%prob%gradient_kind = 1
ELSE
! IF ( COUNT( G( : n ) == 0.0_rp_ ) == n ) THEN
! data%prob%gradient_kind = 0
! ELSE IF ( COUNT( G( : n ) == 1.0_rp_ ) == n ) THEN
! data%prob%gradient_kind = 1
! ELSE
data%prob%gradient_kind = 2
array_name = 'qpa: data%prob%G'
CALL SPACE_resize_array( n, data%prob%G, &
Expand All @@ -13291,7 +13291,7 @@ SUBROUTINE QPA_solve_bcl1qp( data, status, H_val, G, f, rho_g, &
out = data%qpa_control%error )
IF ( data%qpa_inform%status /= 0 ) GO TO 900
data%prob%G( : n ) = G( : n )
END IF
! END IF

! save the lower and upper simple bounds

Expand Down

0 comments on commit 82032a1

Please sign in to comment.