From 02a1f9512139c38994ad7e5ee9f44e1727b01e4b Mon Sep 17 00:00:00 2001
From: Jacqueline Deans <jdeans289@gmail.com>
Date: Fri, 10 Mar 2023 10:20:33 -0600
Subject: [PATCH] Allow integ_loop, logging, data_record to be reordered
 (#1472)

---
 libexec/trick/pm/parse_s_define.pm | 35 +++++++++++++++++++-----------
 test/SIM_job_class_order/S_define  |  1 +
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/libexec/trick/pm/parse_s_define.pm b/libexec/trick/pm/parse_s_define.pm
index d05b8ff8..5c179ed4 100644
--- a/libexec/trick/pm/parse_s_define.pm
+++ b/libexec/trick/pm/parse_s_define.pm
@@ -20,8 +20,6 @@ use Text::Balanced qw(extract_bracketed);
 use html ;
 use get_paths ;
 
-no warnings ;
-
 my ($integ_loop_def , $collect_def , $vcollect_def);
 my ($job_class_order_def ) ;
 my ($sim_class_def , $sim_class_job_def , $instantiation_def , $create_connections_def) ;
@@ -945,9 +943,6 @@ sub preparse_job_class_order($$) {
         return ;
     }
 
-    # Scheduled loop classes that should not be reordered
-    my @non_reorderable_classes = qw(logging data_record system_checkpoint system_advance_sim_time system_moding integ_loop);
-
     # get a list of classes
     ($class_text) = @{$job_class_order_structs}[0] =~ /{(.*?)}/sx ;
     $class_text =~ s/^\s+|\s+$//gs ;
@@ -960,11 +955,6 @@ sub preparse_job_class_order($$) {
             edit_and_exit("CP bad job class order" , "$s_define_file" , 1 ) ;
         }
         $temp_hash{$c}++ ;
-
-        if ($c ~~ @non_reorderable_classes) {
-            trick_print($$sim_ref{fh}, "\nCP ERROR:\n    Job class \"$c\" cannot be reordered by job_class_order.\n" , "title_red" , $$sim_ref{args}{v} ) ;
-            edit_and_exit("CP bad job class order" , "$s_define_file" , 1 ) ;
-        }
     }
 
     # save the new order
@@ -979,9 +969,28 @@ sub preparse_job_class_order($$) {
         push @{$$sim_ref{user_class_order}} , "automatic_last" ;
     }
 
-    # Push on the rest of the non-reorderable system job classes
-    foreach my $c ( @non_reorderable_classes ) {
-        push @{$$sim_ref{user_class_order}} , $c ;
+    if ( !exists $temp_hash{logging} ) {
+        push @{$$sim_ref{user_class_order}} , "logging" ;
+    }
+
+    if ( !exists $temp_hash{data_record} ) {
+        push @{$$sim_ref{user_class_order}} , "data_record" ;
+    }
+
+    if ( !exists $temp_hash{system_checkpoint} ) {
+        push @{$$sim_ref{user_class_order}} , "system_checkpoint" ;
+    }
+
+    if ( !exists $temp_hash{system_advance_sim_time} ) {
+        push @{$$sim_ref{user_class_order}} , "system_advance_sim_time" ;
+    }
+
+    if ( !exists $temp_hash{system_moding} ) {
+        push @{$$sim_ref{user_class_order}} , "system_moding" ;
+    }
+
+    if ( !exists $temp_hash{integ_loop} ) {
+        push @{$$sim_ref{user_class_order}} , "integ_loop" ;
     }
 }
 
diff --git a/test/SIM_job_class_order/S_define b/test/SIM_job_class_order/S_define
index b2187c18..cc11ace7 100644
--- a/test/SIM_job_class_order/S_define
+++ b/test/SIM_job_class_order/S_define
@@ -37,6 +37,7 @@ StarterSimObject starterSimObject;
 
 job_class_order {
    my_class ,
+   integ_loop,
    scheduled 
 };