restrict module names to <= 31 characters

ralna · Feb 2, 2024 · f5a8165 · f5a8165
1 parent d4c4cb9
commit f5a8165
Show file tree

Hide file tree

Showing 47 changed files with 1,052 additions and 232 deletions.
diff --git a/include/galahad_modules.h b/include/galahad_modules.h
diff --git a/include/spral_procedures.h b/include/spral_procedures.h
@@ -40,7 +40,7 @@
 #define spral_ssids_types_precision spral_ssids_types_single_64
 #define spral_match_order_precision spral_match_order_single_64
 #define spral_cuda_precision spral_cuda_single_64
-#define spral_rutherford_boeing_precision spral_rutherford_boeing_single_64
+#define spral_ral_boeing_precision spral_ral_boeing_single_64
 #define spral_random_precision spral_random_single_64
 #define spral_matrix_util_precision spral_matrix_util_single_64
 #else
@@ -61,7 +61,7 @@
 #define spral_ssids_types_precision spral_ssids_types_single
 #define spral_match_order_precision spral_match_order_single
 #define spral_cuda_precision spral_cuda_single
-#define spral_rutherford_boeing_precision spral_rutherford_boeing_single
+#define spral_ral_boeing_precision spral_ral_boeing_single
 #define spral_random_precision spral_random_single
 #define spral_matrix_util_precision spral_matrix_util_single
 #endif
@@ -84,7 +84,7 @@
 #define spral_ssids_types_precision spral_ssids_types_double_64
 #define spral_match_order_precision spral_match_order_double_64
 #define spral_cuda_precision spral_cuda_double_64
-#define spral_rutherford_boeing_precision spral_rutherford_boeing_double_64
+#define spral_ral_boeing_precision spral_ral_boeing_double_64
 #define spral_random_precision spral_random_double_64
 #define spral_matrix_util_precision spral_matrix_util_double_64
 #else
@@ -105,7 +105,7 @@
 #define spral_ssids_types_precision spral_ssids_types_double
 #define spral_match_order_precision spral_match_order_double
 #define spral_cuda_precision spral_cuda_double
-#define spral_rutherford_boeing_precision spral_rutherford_boeing_double
+#define spral_ral_boeing_precision spral_ral_boeing_double
 #define spral_random_precision spral_random_double
 #define spral_matrix_util_precision spral_matrix_util_double
 #endif

diff --git a/src/arc/usearc.F90 b/src/arc/usearc.F90
@@ -1,4 +1,4 @@
-! THIS VERSION: GALAHAD 4.2 - 2023-11-15 AT 07:40 GMT.
+! THIS VERSION: GALAHAD 4.3 - 2024-02-01 AT 16:40 GMT.
 
 #include "galahad_modules.h"
 
@@ -23,7 +23,7 @@ MODULE GALAHAD_USEARC_precision
      USE GALAHAD_SPACE_precision
      USE GALAHAD_USERDATA_precision
      USE GALAHAD_NLPT_precision, ONLY: NLPT_problem_type
-     USE GALAHAD_CUTEST_FUNCTIONS_precision
+     USE GALAHAD_CUTEST_precision
      IMPLICIT NONE
 
      PRIVATE
@@ -48,8 +48,8 @@ SUBROUTINE USE_ARC( input )
      TYPE ( ARC_data_type ) :: data
      TYPE ( NLPT_problem_type ) :: nlp
      TYPE ( GALAHAD_userdata_type ) :: userdata
-     TYPE ( CUTEST_FUNCTIONS_control_type ) :: cutest_control
-     TYPE ( CUTEST_FUNCTIONS_inform_type ) :: cutest_inform
+     TYPE ( CUTEST_control_type ) :: cutest_control
+     TYPE ( CUTEST_inform_type ) :: cutest_inform
 
 !-----------------------------------------------
 !   L o c a l   P a r a m e t e r s

diff --git a/src/bgo/usebgo.F90 b/src/bgo/usebgo.F90
@@ -1,4 +1,4 @@
-! THIS VERSION: GALAHAD 4.2 - 2023-11-15 AT 07:40 GMT.
+! THIS VERSION: GALAHAD 4.3 - 2024-02-01 AT 16:40 GMT.
 
 #include "galahad_modules.h"
 
@@ -23,7 +23,7 @@ MODULE GALAHAD_USEBGO_precision
      USE GALAHAD_SPACE_precision
      USE GALAHAD_USERDATA_precision
      USE GALAHAD_NLPT_precision, ONLY: NLPT_problem_type
-     USE GALAHAD_CUTEST_FUNCTIONS_precision
+     USE GALAHAD_CUTEST_precision
      IMPLICIT NONE
 
      PRIVATE
@@ -48,8 +48,8 @@ SUBROUTINE USE_BGO( input )
      TYPE ( BGO_data_type ) :: data
      TYPE ( NLPT_problem_type ) :: nlp
      TYPE ( GALAHAD_userdata_type ) :: userdata
-     TYPE ( CUTEST_FUNCTIONS_control_type ) :: cutest_control
-     TYPE ( CUTEST_FUNCTIONS_inform_type ) :: cutest_inform
+     TYPE ( CUTEST_control_type ) :: cutest_control
+     TYPE ( CUTEST_inform_type ) :: cutest_inform
 
 !-----------------------------------------------
 !   L o c a l   P a r a m e t e r s

diff --git a/src/blls/C/blls_ciface.F90 b/src/blls/C/blls_ciface.F90
@@ -1,4 +1,4 @@
-! THIS VERSION: GALAHAD 4.3 - 2023-12-29 AT 15:30 GMT.
+! THIS VERSION: GALAHAD 4.3 - 2024-02-02 AT 07:50 GMT.
 
 #include "galahad_modules.h"
 #include "galahad_cfunctions.h"
@@ -43,7 +43,7 @@ MODULE GALAHAD_BLLS_precision_ciface
         copy_sbls_control_in  => copy_control_in,                              &
         copy_sbls_control_out => copy_control_out
 
-    USE GALAHAD_CONVERT_precision_ciface, ONLY:                                &
+    USE GALAHAD_CONVRT_precision_ciface, ONLY:                                 &
         convert_inform_type,                                                   &
         convert_control_type,                                                  &
         copy_convert_inform_in   => copy_inform_in,                            &

diff --git a/src/convert/C/convert_ciface.F90 b/src/convert/C/convert_ciface.F90
@@ -1,4 +1,4 @@
-! THIS VERSION: GALAHAD 4.1 - 2023-01-24 AT 09:30 GMT.
+! THIS VERSION: GALAHAD 4.3 - 2024-02-02 AT 07:50 GMT.
 
 #include "galahad_modules.h"
 #include "galahad_cfunctions.h"
@@ -14,7 +14,7 @@
 !  For full documentation, see
 !   http://galahad.rl.ac.uk/galahad-www/specs.html
 
-  MODULE GALAHAD_CONVERT_precision_ciface
+  MODULE GALAHAD_CONVRT_precision_ciface
     USE GALAHAD_KINDS_precision
     USE GALAHAD_common_ciface
     USE GALAHAD_CONVERT_precision, ONLY:                                       &
@@ -207,14 +207,14 @@ SUBROUTINE copy_inform_out( finform, cinform )
 
     END SUBROUTINE copy_inform_out
 
-  END MODULE GALAHAD_CONVERT_precision_ciface
+  END MODULE GALAHAD_CONVRT_precision_ciface
 
 !  -------------------------------------
 !  C interface to fortran convert_initialize
 !  -------------------------------------
 
   SUBROUTINE convert_initialize( cdata, ccontrol, status ) BIND( C )
-  USE GALAHAD_CONVERT_precision_ciface
+  USE GALAHAD_CONVRT_precision_ciface
   IMPLICIT NONE
 
 !  dummy arguments
@@ -256,7 +256,7 @@ END SUBROUTINE convert_initialize
 !  ----------------------------------------
 
   SUBROUTINE convert_read_specfile( ccontrol, cspecfile ) BIND( C )
-  USE GALAHAD_CONVERT_precision_ciface
+  USE GALAHAD_CONVRT_precision_ciface
   IMPLICIT NONE
 
 !  dummy arguments
@@ -306,7 +306,7 @@ END SUBROUTINE convert_read_specfile
 !  --------------------------------------
 
   SUBROUTINE convert_information( cdata, cinform, status ) BIND( C )
-  USE GALAHAD_CONVERT_precision_ciface
+  USE GALAHAD_CONVRT_precision_ciface
   IMPLICIT NONE
 
 !  dummy arguments
@@ -340,7 +340,7 @@ END SUBROUTINE convert_information
 !  ------------------------------------
 
   SUBROUTINE convert_terminate( cdata, ccontrol, cinform ) BIND( C )
-  USE GALAHAD_CONVERT_precision_ciface
+  USE GALAHAD_CONVRT_precision_ciface
   IMPLICIT NONE
 
 !  dummy arguments

diff --git a/src/cutest_functions/cutest_functions.F90 b/src/cutest_functions/cutest_functions.F90
@@ -1,4 +1,4 @@
-! THIS VERSION: GALAHAD 4.3 - 2024-01-19 AT 07:20 GMT.
+! THIS VERSION: GALAHAD 4.3 - 2024-02-01 AT 16:20 GMT.
 
 #include "galahad_modules.h"
 #include "cutest_routines.h"
@@ -11,7 +11,7 @@
 !  History -
 !   originally released pre GALAHAD Version 2.2. February 22nd 2008
 !
-   MODULE GALAHAD_CUTEST_FUNCTIONS_precision
+   MODULE GALAHAD_CUTEST_precision
 
      USE GALAHAD_KINDS_precision
      USE GALAHAD_STRING
@@ -44,14 +44,14 @@ MODULE GALAHAD_CUTEST_FUNCTIONS_precision
 !  D e r i v e d   t y p e   d e f i n i t i o n
 !------------------------------------------------
 
-     TYPE, PUBLIC :: CUTEst_FUNCTIONS_control_type
+     TYPE, PUBLIC :: CUTEST_control_type
        INTEGER ( KIND = ip_ ) :: input = 5
        INTEGER ( KIND = ip_ ) :: error = 6
        INTEGER ( KIND = ip_ ) :: io_buffer = 11
        LOGICAL :: separate_linear_constraints = .FALSE.
      END TYPE
 
-     TYPE, PUBLIC :: CUTEst_FUNCTIONS_inform_type
+     TYPE, PUBLIC :: CUTEST_inform_type
        INTEGER ( KIND = ip_ ) :: status = 0
        INTEGER ( KIND = ip_ ) :: alloc_status = 0
        CHARACTER ( LEN = 80 ) :: bad_alloc = REPEAT( ' ', 80 )
@@ -97,8 +97,8 @@ SUBROUTINE CUTEst_initialize( nlp, control, inform, userdata,             &
 
      TYPE ( NLPT_problem_type ), INTENT( OUT ) :: nlp
      TYPE ( GALAHAD_userdata_type ), INTENT( OUT ) :: userdata
-     TYPE ( CUTEst_FUNCTIONS_control_type ), INTENT( IN ) :: control
-     TYPE ( CUTEst_FUNCTIONS_inform_type ), INTENT( OUT ) :: inform
+     TYPE ( CUTEST_control_type ), INTENT( IN ) :: control
+     TYPE ( CUTEST_inform_type ), INTENT( OUT ) :: inform
      LOGICAL, OPTIONAL, INTENT( IN ) :: no_hessian, no_jacobian
      LOGICAL, OPTIONAL, INTENT( IN ) :: hessian_products
      LOGICAL, OPTIONAL, INTENT( IN ) :: sparse_gradient
@@ -2011,7 +2011,7 @@ SUBROUTINE CUTEst_terminate( nlp, inform, userdata )
 
      TYPE ( NLPT_problem_type ), INTENT( INOUT ) :: nlp
      TYPE ( GALAHAD_userdata_type ), INTENT( INOUT ) :: userdata
-     TYPE ( CUTEst_FUNCTIONS_inform_type ), INTENT( OUT ) :: inform
+     TYPE ( CUTEST_inform_type ), INTENT( OUT ) :: inform
 
      CALL NLPT_cleanup( nlp )
      CALL SPACE_dealloc_array( userdata%integer, inform%status,                &
@@ -2168,4 +2168,4 @@ SUBROUTINE CUTEst_timing( status, userdata, name, time )
 
      END SUBROUTINE CUTEst_timing
 
-   END MODULE GALAHAD_CUTEST_FUNCTIONS_precision
+   END MODULE GALAHAD_CUTEST_precision
diff --git a/src/dgo/usedgo.F90 b/src/dgo/usedgo.F90
@@ -1,4 +1,4 @@
-! THIS VERSION: GALAHAD 4.2 - 2023-11-15 AT 07:40 GMT.
+! THIS VERSION: GALAHAD 4.3 - 2024-02-01 AT 16:40 GMT.
 
 #include "galahad_modules.h"
 
@@ -23,7 +23,7 @@ MODULE GALAHAD_USEDGO_precision
      USE GALAHAD_SPACE_precision
      USE GALAHAD_NLPT_precision, ONLY: NLPT_problem_type
      USE GALAHAD_USERDATA_precision
-     USE GALAHAD_CUTEST_FUNCTIONS_precision
+     USE GALAHAD_CUTEST_precision
      IMPLICIT NONE
 
      PRIVATE
@@ -48,8 +48,8 @@ SUBROUTINE USE_DGO( input )
      TYPE ( DGO_data_type ) :: data
      TYPE ( NLPT_problem_type ) :: nlp
      TYPE ( GALAHAD_userdata_type ) :: userdata
-     TYPE ( CUTEST_FUNCTIONS_control_type ) :: cutest_control
-     TYPE ( CUTEST_FUNCTIONS_inform_type ) :: cutest_inform
+     TYPE ( CUTEST_control_type ) :: cutest_control
+     TYPE ( CUTEST_inform_type ) :: cutest_inform
 
 !-----------------------------------------------
 !   L o c a l   P a r a m e t e r s

diff --git a/src/dum/cutest_dummy.F90 b/src/dum/cutest_dummy.F90
@@ -1,4 +1,4 @@
-! THIS VERSION: GALAHAD 4.2 - 2023-11-15 AT 07:40 GMT.
+! THIS VERSION: GALAHAD 4.3 - 2024-02-01 AT 16:40 GMT.
 
 #include "galahad_modules.h"
 #include "cutest_routines.h"
@@ -23,7 +23,7 @@ END SUBROUTINE ELFUN_flexible
    SUBROUTINE GROUP_r()
    END SUBROUTINE GROUP
 
-   MODULE GALAHAD_CUTEST_FUNCTIONS_precision
+   MODULE GALAHAD_CUTEST_precision
 
      USE GALAHAD_KINDS_precision
 
@@ -110,7 +110,7 @@ END SUBROUTINE CUTEst_start_timing
      SUBROUTINE CUTEst_timing( )
      END SUBROUTINE CUTEst_timing
 
-   END MODULE GALAHAD_CUTEST_FUNCTIONS_precision
+   END MODULE GALAHAD_CUTEST_precision
 
    SUBROUTINE CUTEST_probname_r( cutest_status, p_name )
    USE GALAHAD_KINDS_precision

diff --git a/src/dum/fa14d.f b/src/dum/fa14d.f
@@ -1,10 +1,11 @@
-#include "galahad_modules.h"
+! THIS VERSION: GALAHAD 4.3 - 2024-02-01 AT 10:30 GMT.
 
-! THIS VERSION: GALAHAD 4.3 - 2024-01-05 AT 14:30 GMT.
+#include "galahad_modules.h"
 
       DOUBLE PRECISION FUNCTION FA14AD( ix, i )
       USE GALAHAD_KINDS
       INTEGER ( KIND = ip_ ) :: ix, i
+      FA14AD = - 3.0_dp_
       END FUNCTION FA14AD
 
       SUBROUTINE FA14ID( ix )

diff --git a/src/dum/fa14s.f b/src/dum/fa14s.f
@@ -1,10 +1,11 @@
-#include "galahad_modules.h"
+! THIS VERSION: GALAHAD 4.3 - 2024-02-01 AT 10:30 GMT.
 
-! THIS VERSION: GALAHAD 4.3 - 2024-01-05 AT 14:30 GMT.
+#include "galahad_modules.h"
 
       REAL FUNCTION FA14A( ix, i )
       USE GALAHAD_KINDS
       INTEGER ( KIND = ip_ ) :: ix, i
+      FA14AD = - 3.0_sp_
       END FUNCTION FA14A
 
       SUBROUTINE FA14I( ix )

diff --git a/src/fdh/usefdh.F90 b/src/fdh/usefdh.F90
@@ -1,4 +1,4 @@
-! THIS VERSION: GALAHAD 4.3 - 2024-01-19 AT 16:20 GMT.
+! THIS VERSION: GALAHAD 4.3 - 2024-02-01 AT 16:20 GMT.
 
 #include "galahad_modules.h"
 #include "cutest_routines.h"
@@ -22,7 +22,7 @@ MODULE GALAHAD_USEFDH_precision
      USE GALAHAD_SPACE_precision
      USE GALAHAD_RAND_precision
      USE GALAHAD_CLOCK
-     USE GALAHAD_CUTEST_FUNCTIONS_precision
+     USE GALAHAD_CUTEST_precision
      USE GALAHAD_USERDATA_precision
      USE CUTEST_INTERFACE_precision
 

diff --git a/src/forthcoming/barc/usebarc.F90 b/src/forthcoming/barc/usebarc.F90
@@ -1,4 +1,4 @@
-! THIS VERSION: GALAHAD 4.2 - 2023-11-15 AT 07:40 GMT.
+! THIS VERSION: GALAHAD 4.3 - 2024-02-01 AT 16:40 GMT.
 
 #include "galahad_modules.h"
 
@@ -21,7 +21,7 @@ MODULE GALAHAD_USEBARC_precision
      USE GALAHAD_SPACE_precision
      USE GALAHAD_USERDATA_precision
      USE GALAHAD_NLPT_precision, ONLY: NLPT_problem_type
-     USE GALAHAD_CUTEST_FUNCTIONS_precision
+     USE GALAHAD_CUTEST_precision
      IMPLICIT NONE
 
      PRIVATE
@@ -46,8 +46,8 @@ SUBROUTINE USE_BARC( input )
      TYPE ( BARC_data_type ) :: data
      TYPE ( NLPT_problem_type ) :: nlp
      TYPE ( GALAHAD_userdata_type ) :: userdata
-     TYPE ( CUTEST_FUNCTIONS_control_type ) :: cutest_control
-     TYPE ( CUTEST_FUNCTIONS_inform_type ) :: cutest_inform
+     TYPE ( CUTEST_control_type ) :: cutest_control
+     TYPE ( CUTEST_inform_type ) :: cutest_inform
 
 !-----------------------------------------------
 !   L o c a l   P a r a m e t e r s

diff --git a/src/forthcoming/colt/RUNCOLT.meta b/src/forthcoming/colt/RUNCOLT.meta
@@ -29,6 +29,9 @@ MAIN
 ! restart-data-file-name                            COLTSAVE.d
 ! restart-data-file-device                          59
 ! save-data-for-restart-every                       0
+! number-of-evaluation-points                       0
+! lower-evaluation-point                            0.0
+! upper-evaluation-point                            0.0
 
 INCLUDE COLT