removed debug write statements

Author: waldemar-martens

pyoptgra/_about.py

@@ -2,4 +2,4 @@
 """Version number of pyoptgra package"""
 from importlib.metadata import version
 
-__version__ = "1.3.0"  # version("pyoptgra")  # import version from pyproject.toml
+__version__ = version("pyoptgra")  # import version from pyproject.toml

pyoptgra/core/ogopti.F

@@ -90,7 +90,6 @@ SUBROUTINE OGOPTI (VARACC, NUMEQU, FINISH, DESNOR, CALVAL)
 C      ENDDO
 C ======================================================================
  1100 CONTINUE
-      WRITE(LOGLUP, '("OGOPTI 1100")')  ! TMP
 C ======================================================================
 C VECTOR OF STEEPEST ASCENT
 C ----------------------------------------------------------------------
@@ -130,11 +129,9 @@ SUBROUTINE OGOPTI (VARACC, NUMEQU, FINISH, DESNOR, CALVAL)
               CONACT(CON) = -1
           ENDIF
       ENDDO
-      WRITE(LOGLUP, '("OGOPTI 13")')  ! TMP
 C ======================================================================
       NNN = 1
  1110 CONTINUE
-      WRITE(LOGLUP, '("OGOPTI 1110")') ! TMP
       NNN = NNN + 1
       IF (NNN .GT. 999) THEN
           FINISH = 0
@@ -177,7 +174,6 @@ SUBROUTINE OGOPTI (VARACC, NUMEQU, FINISH, DESNOR, CALVAL)
           CALL OGEXCL (IND)
           GOTO 1110
       ENDIF
-      CALL SLEEP(1) ! TMP
 C ----------------------------------------------------------------------
 C CONSTRAINT INCLUSION
 C ----------------------------------------------------------------------
@@ -210,7 +206,6 @@ SUBROUTINE OGOPTI (VARACC, NUMEQU, FINISH, DESNOR, CALVAL)
               INC = CON
           ENDIF
       ENDDO
-      WRITE(LOGLUP, '("OGOPTI 19")')  ! TMP
 C ----------------------------------------------------------------------
       IF (INC .NE. 0) THEN
           CON = INC
@@ -222,10 +217,8 @@ SUBROUTINE OGOPTI (VARACC, NUMEQU, FINISH, DESNOR, CALVAL)
           CALL OGINCL (INC)
           GOTO 1110
       ENDIF
-      WRITE(LOGLUP, '("OGOPTI 20")')  ! TMP
 C ----------------------------------------------------------------------
  3999 CONTINUE
-      WRITE(LOGLUP, '("OGOPTI 3999")') ! TMP
 C ----------------------------------------------------------------------
 C MATCHED INEQUALITY CONSTRAINTS + STEEPEST ASCENT VECTOR NORM
 C ----------------------------------------------------------------------
@@ -327,7 +320,6 @@ SUBROUTINE OGOPTI (VARACC, NUMEQU, FINISH, DESNOR, CALVAL)
       ENDIF
 C ======================================================================
  7766 CONTINUE
-      WRITE(LOGLUP, '("OGOPTI 7766")') ! TMP
 C ----------------------------------------------------------------------
       CALL OGRIGT (-CONRED(COS,1:NUMACT), COSACT)
       DO VAR = 1, NUMVAR
@@ -473,7 +465,6 @@ SUBROUTINE OGOPTI (VARACC, NUMEQU, FINISH, DESNOR, CALVAL)
 C SECOND ORDER DERIVATIVES BY NUMERICAL DIFFERENCING
 C ----------------------------------------------------------------------
  4112 CONTINUE
-      WRITE(LOGLUP, '("OGOPTI 4112")') ! TMP
 C ----------------------------------------------------------------------
       CALL OGWRIT (3,"")
       WRITE (STR,'("SECOND ORDER CORRECTION")')
@@ -518,9 +509,7 @@ SUBROUTINE OGOPTI (VARACC, NUMEQU, FINISH, DESNOR, CALVAL)
       IF     (SENOPT .LE.  0 .OR. NNN .EQ. 1) THEN
           FAC = VARSTP / DESNOR
           VARVEC = VARREF + VARDES * VARSTP / DESNOR
-          WRITE(LOGLUP, '("OGEVAL CALL OGOPTI ")')  ! TMP
           CALL OGEVAL (VARVEC, CONVEC, 0, CONDER, CALVAL, CALVAL)
-          WRITE(LOGLUP, '("AFTER OGEVAL CALL OGOPTI")')  ! TMP
           CONQUA = MATMUL (CONDER(1:COS,       1:NUMVAR),
      &                     VARDES(             1:NUMVAR))
           CONQUA = 2D0 * (CONVEC - CONREF - CONQUA * FAC) / FAC**2
@@ -545,7 +534,6 @@ SUBROUTINE OGOPTI (VARACC, NUMEQU, FINISH, DESNOR, CALVAL)
       CALL OGWRIT (3,STR)
       WRITE (STR,'("ACCUMULATED  DISTANCE: ",D13.6)') VARACC
       CALL OGWRIT (3,STR)
-      WRITE(LOGLUP, '("OGOPTI 1")')  ! TMP
 C ======================================================================
 C GET EXTREMUM
 C ----------------------------------------------------------------------
@@ -602,7 +590,6 @@ SUBROUTINE OGOPTI (VARACC, NUMEQU, FINISH, DESNOR, CALVAL)
           CALL OGWRIT (3,STR)
           STAFLG = 2
       ENDIF
-      WRITE(LOGLUP, '("OGOPTI 2")')  ! TMP
 C ======================================================================
 C IF MAXIMUM DISTANCE IS HIT
 C ----------------------------------------------------------------------
@@ -616,7 +603,6 @@ SUBROUTINE OGOPTI (VARACC, NUMEQU, FINISH, DESNOR, CALVAL)
           CALL OGWRIT (3,STR)
           STAFLG = 2
       ENDIF
-      WRITE(LOGLUP, '("OGOPTI 3")')  ! TMP
 C ======================================================================
 C IF CONVERGENCE
 C ----------------------------------------------------------------------
@@ -634,7 +620,6 @@ SUBROUTINE OGOPTI (VARACC, NUMEQU, FINISH, DESNOR, CALVAL)
           FINISH = 1
           GOTO 9999
       ENDIF
-      WRITE(LOGLUP, '("OGOPTI 4")')  ! TMP
 C ======================================================================
 C IF REMAINING DISTANCE IS HIT
 C ----------------------------------------------------------------------
@@ -693,13 +678,11 @@ SUBROUTINE OGOPTI (VARACC, NUMEQU, FINISH, DESNOR, CALVAL)
           CALL OGWRIT (3,STR)
           STAFLG = 3
       ENDIF
-      WRITE(LOGLUP, '("OGOPTI 5")')  ! TMP
 C ======================================================================
 C UPDATE
 C ----------------------------------------------------------------------
       REFDIS = FOLDIS
  8211 CONTINUE
-      WRITE(LOGLUP, '("OGOPTI 8211")') ! TMP
       WRITE (STR,'("FINAL...............:",1X,D13.6,'//
      &'2(1X,D10.3),1X,D16.9)')
      &FOLDIS, QUACOR, COSIMP, CONVAL(COS) + COSIMP
@@ -722,7 +705,6 @@ SUBROUTINE OGOPTI (VARACC, NUMEQU, FINISH, DESNOR, CALVAL)
       ENDDO
       DIS = DSQRT (DIS)
 C ----------------------------------------------------------------------
-      WRITE(LOGLUP, '("OGOPTI 6")')  ! TMP
       WRITE (STR,*) "REFDIS=",REFDIS
       CALL OGWRIT (3,STR)
       WRITE (STR,*) "FOLDIS=",FOLDIS
@@ -751,7 +733,6 @@ SUBROUTINE OGOPTI (VARACC, NUMEQU, FINISH, DESNOR, CALVAL)
           CALL OGWRIT (3,STR)
           STAFLG = 2
       ENDIF
-      WRITE(LOGLUP, '("OGOPTI 7")')  ! TMP
 C ======================================================================
 C MAXIMUM REACHED: NEXT ITERATION
 C ----------------------------------------------------------------------
@@ -763,7 +744,6 @@ SUBROUTINE OGOPTI (VARACC, NUMEQU, FINISH, DESNOR, CALVAL)
           IF (SENOPT .GT. 0) FINISH = 1
           GOTO 9999
       ENDIF
-      WRITE(LOGLUP, '("OGOPTI 8")')  ! TMP
 C ======================================================================
 C MAXIMUM TRAVEL DISTANCE REACHED: NEXT ITERATION
 C ----------------------------------------------------------------------
@@ -774,7 +754,6 @@ SUBROUTINE OGOPTI (VARACC, NUMEQU, FINISH, DESNOR, CALVAL)
           CALL OGWRIT (2,STR)
           GOTO 9999
       ENDIF
-      WRITE(LOGLUP, '("OGOPTI 10", I0)')  STAFLG ! TMP
 C ======================================================================
 C CONSTRAINT HIT: UPDATE CONSTRAINT + CORRECT
 C ----------------------------------------------------------------------
@@ -794,10 +773,8 @@ SUBROUTINE OGOPTI (VARACC, NUMEQU, FINISH, DESNOR, CALVAL)
           CONVAL = CONVAL + CONVEC * FAC
           GOTO 1100
       ENDIF
-      WRITE(LOGLUP, '("OGOPTI 11")')  ! TMP
 C ======================================================================
  9999 CONTINUE
-      WRITE(LOGLUP, '("OGOPTI 9999")') ! TMP
 C ----------------------------------------------------------------------
       FUNVAR = DESPRV
       CONFIX = CONACT(1:NUMCON)

pyoptgra/timeout.py

@@ -12,7 +12,6 @@
 # file, you can obtain them at https://www.gnu.org/licenses/gpl-3.0.txt
 # and https://essr.esa.int/license/european-space-agency-community-license-v2-4-weak-copyleft
 
-import math
 import multiprocessing as mp
 from typing import Any, Callable, List, Tuple