Compiling dmUpdate post merge of 2022.03-beta1

diag_manager/fms_diag_object.F90

@@ -1078,8 +1078,8 @@ INTEGER FUNCTION fms_register_static_field(module_name, field_name, axes, long_n
     CHARACTER(len=*),               OPTIONAL, INTENT(in) :: long_name     !< Longname to be added as a attribute
     CHARACTER(len=*),               OPTIONAL, INTENT(in) :: units         !< Units to be added as a attribute
     CHARACTER(len=*),               OPTIONAL, INTENT(in) :: standard_name !< Standard name to be added as a attribute
-    class(*),                       OPTIONAL, INTENT(in) :: missing_value !< Missing value to be added as a attribute
-    class(*),         DIMENSION(:), OPTIONAL, INTENT(in) :: range         !< Range to be added as a attribute
+    CLASS(*),                       OPTIONAL, INTENT(in) :: missing_value !< Missing value to be added as a attribute
+    CLASS(*),                       OPTIONAL, INTENT(in) :: range(:)      !< Range to be added as a attribute
     LOGICAL,                        OPTIONAL, INTENT(in) :: mask_variant  !< Flag indicating if the field is has
                                                                           !! a mask variant
     LOGICAL,                        OPTIONAL, INTENT(in) :: DYNAMIC       !< Flag indicating if the field is dynamic

test_fms/diag_manager/test_diag_manager2.sh

@@ -458,7 +458,7 @@ setup_test
 test_expect_success "Unstructured grid (test $my_test_count)" '
   mpirun -n 1 ../test_diag_manager
 '
-
+my_test_count=24
 # test_diag_manager_time
 cat <<_EOF > diag_table
 test_diag_manager
@@ -494,6 +494,7 @@ test_diag_manager
  "test_diag_manager_mod", "ice", "ice", "test_diurnal",  "all", "diurnal3", "none", 2
 _EOF
 
+my_test_count=25
 test_expect_success "diurnal test (test $my_test_count)" '
   mpirun -n 1 ../test_diag_manager_time
 '
@@ -576,6 +577,7 @@ diag_files:
 _EOF
 cp diag_table.yaml diag_table.yaml_base
 
+my_test_count=26
 test_expect_success "diag_yaml test (test $my_test_count)" '
   mpirun -n 1 ../test_diag_yaml
 '
@@ -627,10 +629,13 @@ diag_files:
     reduction: average
     kind: r4
 _EOF
+
+my_test_count=41
 test_expect_success "Test the diag_ocean feature in diag_manager_init (test $my_test_count)" '
   mpirun -n 2 ../test_diag_ocean
 '
 
+my_test_count=42
 test_expect_success "test_diag_dlinked_list (test $my_test_count)" '
   mpirun -n 1 ../test_diag_dlinked_list
 '
@@ -701,7 +706,9 @@ diag_files:
     kind: r4
 _EOF
 
+my_test_count=43
 test_expect_success "Test the modern diag manager end to end (test $my_test_count)" '
   mpirun -n 6 ../test_modern_diag
 '
+
 test_done