Skip to content

Add actual constraint numbers to mfile #3038

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
jonmaddock merged 1 commit into from
Feb 5, 2024
Merged

Add actual constraint numbers to mfile #3038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions source/fortran/final_module.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ subroutine no_optimisation()
write(nout,140) inn,lablcc(icc(inn)),sym(inn),con2(inn), &
lab(inn),err(inn),lab(inn),con1(inn)
call ovarre(mfile,lablcc(icc(inn))//' normalised residue', &
'(normres'//int_to_string3(inn)//')',con1(inn))
'(eq_con'//int_to_string3(icc(inn))//')',con1(inn))
end do

140 format(t2,i4,t8,a33,t46,a1,t47,1pe12.4,t60,a10,t71,1pe12.4,t84,a10,t98,1pe12.4)
Expand All @@ -63,7 +63,7 @@ subroutine no_optimisation()
do inn = neqns+1,neqns+nineqns
write(nout,140) inn,lablcc(icc(inn)),sym(inn),con2(inn), &
lab(inn), err(inn), lab(inn)
call ovarre(mfile,lablcc(icc(inn)),'(constr'//int_to_string3(inn)//')',rcm(inn))
call ovarre(mfile,lablcc(icc(inn)),'(ineq_con'//int_to_string3(icc(inn))//')',rcm(inn))
end do
end if
end subroutine no_optimisation
Expand Down
4 changes: 2 additions & 2 deletions source/fortran/scan.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1086,7 +1086,7 @@ subroutine post_optimise(ifail)
write(nout,110) inn,lablcc(icc(inn)),sym(inn),con2(inn), &
lab(inn),err(inn),lab(inn),con1(inn)
call ovarre(mfile,lablcc(icc(inn))//' normalised residue', &
'(normres'//int_to_string3(inn)//')',con1(inn))
'(eq_con'//int_to_string3(icc(inn))//')',con1(inn))
end do
110 format(t2,i4,t8,a33,t46,a1,t47,1pe12.4,t60,a10,t71,1pe12.4,t84,a10,t98,1pe12.4)

Expand All @@ -1098,7 +1098,7 @@ subroutine post_optimise(ifail)
!write(nout,120) inn,lablcc(icc(inn)),rcm(inn),vlam(inn)
write(nout,110) inn,lablcc(icc(inn)),sym(inn),con2(inn), &
lab(inn), err(inn), lab(inn)
call ovarre(mfile,lablcc(icc(inn)),'(constr'//int_to_string3(inn)//')',rcm(inn))
call ovarre(mfile,lablcc(icc(inn)),'(ineq_con'//int_to_string3(icc(inn))//')',rcm(inn))
end do
end if

Expand Down