Index: /issm/trunk/test/Verification/test01_IceShelfIceFrontM2d/configuration.m =================================================================== --- /issm/trunk/test/Verification/test01_IceShelfIceFrontM2d/configuration.m (revision 3923) +++ /issm/trunk/test/Verification/test01_IceShelfIceFrontM2d/configuration.m (revision 3924) @@ -23,11 +23,11 @@ %sequences analysis sub_analysis qmu control control_fit parallel -sequences={ {'diagnostic', 'none', 0 , 0, 'nan' 0 };... - {'prognostic', 'none', 0 , 0, 'nan' 0 };... - {'prognostic2', 'none', 0 , 0, 'nan' 0 };... - {'transient', 'none', 0 , 0, 'nan' 0 };... - {'diagnostic', 'none', 0 , 0, 'nan' 1 };... - {'prognostic', 'none', 0 , 0, 'nan' 1 };... - {'prognostic2', 'none', 0 , 0, 'nan' 1 };... - {'transient', 'none', 0 , 0, 'nan' 1 };... +sequences={ {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {Prognostic2AnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {TransientAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {Prognostic2AnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {TransientAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... }; Index: /issm/trunk/test/Verification/test02_IceShelfIceFrontM3d/configuration.m =================================================================== --- /issm/trunk/test/Verification/test02_IceShelfIceFrontM3d/configuration.m (revision 3923) +++ /issm/trunk/test/Verification/test02_IceShelfIceFrontM3d/configuration.m (revision 3924) @@ -23,15 +23,15 @@ %sequences analysis sub_analysis qmu control control_fit parallel -sequences={ {'diagnostic', 'none', 0 , 0, 'nan' 0 };... - {'steadystate', 'none', 0 , 0, 'nan' 0 };... - {'prognostic', 'none', 0 , 0, 'nan' 0 };... - {'thermal', 'steady', 0 , 0, 'nan' 0 };... - {'thermal', 'transient', 0 , 0, 'nan' 0 };... - {'transient', 'none', 0 , 0, 'nan' 0 };... - {'diagnostic', 'none', 0 , 0, 'nan' 1 };... - {'steadystate', 'none', 0 , 0, 'nan' 1 };... - {'prognostic', 'none', 0 , 0, 'nan' 1 };... - {'thermal', 'steady', 0 , 0, 'nan' 1 };... - {'thermal', 'transient', 0 , 0, 'nan' 1 };... - {'transient', 'none', 0 , 0, 'nan' 1 };... +sequences={ {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {'steadystate', NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {ThermalAnalysisEnum, SteadyAnalysisEnum, 0 , 0, 'nan' 0 };... + {ThermalAnalysisEnum, TransientAnalysisEnum, 0 , 0, 'nan' 0 };... + {TransientAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {'steadystate', NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {ThermalAnalysisEnum, SteadyAnalysisEnum, 0 , 0, 'nan' 1 };... + {ThermalAnalysisEnum, TransientAnalysisEnum, 0 , 0, 'nan' 1 };... + {TransientAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... }; Index: /issm/trunk/test/Verification/test03_IceShelfIceFrontMP3d/configuration.m =================================================================== --- /issm/trunk/test/Verification/test03_IceShelfIceFrontMP3d/configuration.m (revision 3923) +++ /issm/trunk/test/Verification/test03_IceShelfIceFrontMP3d/configuration.m (revision 3924) @@ -23,9 +23,9 @@ %sequences analysis sub_analysis qmu control control_fit parallel -sequences={ {'prognostic', 'none', 0 , 0, 'nan' 0 };... - {'thermal', 'steady', 0 , 0, 'nan' 0 };... - {'thermal', 'transient', 0 , 0, 'nan' 0 };... - {'prognostic', 'none', 0 , 0, 'nan' 1 };... - {'thermal', 'steady', 0 , 0, 'nan' 1 };... - {'thermal', 'transient', 0 , 0, 'nan' 1 };... +sequences={ {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {ThermalAnalysisEnum, SteadyAnalysisEnum, 0 , 0, 'nan' 0 };... + {ThermalAnalysisEnum, TransientAnalysisEnum, 0 , 0, 'nan' 0 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {ThermalAnalysisEnum, SteadyAnalysisEnum, 0 , 0, 'nan' 1 };... + {ThermalAnalysisEnum, TransientAnalysisEnum, 0 , 0, 'nan' 1 };... }; Index: /issm/trunk/test/Verification/test04_IceShelfIceFrontMPS3d/configuration.m =================================================================== --- /issm/trunk/test/Verification/test04_IceShelfIceFrontMPS3d/configuration.m (revision 3923) +++ /issm/trunk/test/Verification/test04_IceShelfIceFrontMPS3d/configuration.m (revision 3924) @@ -23,9 +23,9 @@ %sequences analysis sub_analysis qmu control control_fit parallel -sequences={ {'prognostic', 'none', 0 , 0, 'nan' 0 };... - {'thermal', 'steady', 0 , 0, 'nan' 0 };... - {'thermal', 'transient', 0 , 0, 'nan' 0 };... - {'prognostic', 'none', 0 , 0, 'nan' 1 };... - {'thermal', 'steady', 0 , 0, 'nan' 1 };... - {'thermal', 'transient', 0 , 0, 'nan' 1 };... +sequences={ {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {ThermalAnalysisEnum, SteadyAnalysisEnum, 0 , 0, 'nan' 0 };... + {ThermalAnalysisEnum, TransientAnalysisEnum, 0 , 0, 'nan' 0 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {ThermalAnalysisEnum, SteadyAnalysisEnum, 0 , 0, 'nan' 1 };... + {ThermalAnalysisEnum, TransientAnalysisEnum, 0 , 0, 'nan' 1 };... }; Index: /issm/trunk/test/Verification/test05_IceShelfIceFrontP3d/configuration.m =================================================================== --- /issm/trunk/test/Verification/test05_IceShelfIceFrontP3d/configuration.m (revision 3923) +++ /issm/trunk/test/Verification/test05_IceShelfIceFrontP3d/configuration.m (revision 3924) @@ -23,13 +23,13 @@ %sequences analysis sub_analysis qmu control control_fit parallel -sequences={ {'diagnostic', 'none', 0 , 0, 'nan' 0 };... - {'prognostic', 'none', 0 , 0, 'nan' 0 };... - {'thermal', 'steady', 0 , 0, 'nan' 0 };... - {'thermal', 'transient', 0 , 0, 'nan' 0 };... - {'transient', 'none', 0 , 0, 'nan' 0 };... - {'diagnostic', 'none', 0 , 0, 'nan' 1 };... - {'prognostic', 'none', 0 , 0, 'nan' 1 };... - {'thermal', 'steady', 0 , 0, 'nan' 1 };... - {'thermal', 'transient', 0 , 0, 'nan' 1 };... - {'transient', 'none', 0 , 0, 'nan' 1 };... +sequences={ {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {ThermalAnalysisEnum, SteadyAnalysisEnum, 0 , 0, 'nan' 0 };... + {ThermalAnalysisEnum, TransientAnalysisEnum, 0 , 0, 'nan' 0 };... + {TransientAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {ThermalAnalysisEnum, SteadyAnalysisEnum, 0 , 0, 'nan' 1 };... + {ThermalAnalysisEnum, TransientAnalysisEnum, 0 , 0, 'nan' 1 };... + {TransientAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... }; Index: /issm/trunk/test/Verification/test06_IceShelfIceFrontS3d/configuration.m =================================================================== --- /issm/trunk/test/Verification/test06_IceShelfIceFrontS3d/configuration.m (revision 3923) +++ /issm/trunk/test/Verification/test06_IceShelfIceFrontS3d/configuration.m (revision 3924) @@ -23,13 +23,13 @@ %sequences analysis sub_analysis qmu control control_fit parallel -sequences={ {'diagnostic', 'none', 0 , 0, 'nan' 0 };... - {'prognostic', 'none', 0 , 0, 'nan' 0 };... - {'steadystate', 'none', 0 , 0, 'nan' 0 };... - {'thermal', 'steady', 0 , 0, 'nan' 0 };... - {'thermal', 'transient', 0 , 0, 'nan' 0 };... - {'diagnostic', 'none', 0 , 0, 'nan' 1 };... - {'prognostic', 'none', 0 , 0, 'nan' 1 };... - {'steadystate', 'none', 0 , 0, 'nan' 1 };... - {'thermal', 'steady', 0 , 0, 'nan' 1 };... - {'thermal', 'transient', 0 , 0, 'nan' 1 };... +sequences={ {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {'steadystate', NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {ThermalAnalysisEnum, SteadyAnalysisEnum, 0 , 0, 'nan' 0 };... + {ThermalAnalysisEnum, TransientAnalysisEnum, 0 , 0, 'nan' 0 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {'steadystate', NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {ThermalAnalysisEnum, SteadyAnalysisEnum, 0 , 0, 'nan' 1 };... + {ThermalAnalysisEnum, TransientAnalysisEnum, 0 , 0, 'nan' 1 };... }; Index: /issm/trunk/test/Verification/test07_IceSheetIceFrontM2d/configuration.m =================================================================== --- /issm/trunk/test/Verification/test07_IceSheetIceFrontM2d/configuration.m (revision 3923) +++ /issm/trunk/test/Verification/test07_IceSheetIceFrontM2d/configuration.m (revision 3924) @@ -23,8 +23,8 @@ %sequences analysis sub_analysis qmu control control_fit parallel -sequences={ {'diagnostic', 'none', 0 , 0, 'nan' 0 };... - {'prognostic', 'none', 0 , 0, 'nan' 0 };... - {'transient', 'none', 0 , 0, 'nan' 0 };... - {'diagnostic', 'none', 0 , 0, 'nan' 1 };... - {'transient', 'none', 0 , 0, 'nan' 1 };... +sequences={ {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {TransientAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {TransientAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... }; Index: /issm/trunk/test/Verification/test08_IceSheetIceFrontM3d/configuration.m =================================================================== --- /issm/trunk/test/Verification/test08_IceSheetIceFrontM3d/configuration.m (revision 3923) +++ /issm/trunk/test/Verification/test08_IceSheetIceFrontM3d/configuration.m (revision 3924) @@ -23,13 +23,13 @@ %sequences analysis sub_analysis qmu control control_fit parallel -sequences={ {'diagnostic', 'none', 0 , 0, 'nan' 0 };... - {'prognostic', 'none', 0 , 0, 'nan' 0 };... - {'thermal', 'steady', 0 , 0, 'nan' 0 };... - {'thermal', 'transient', 0 , 0, 'nan' 0 };... - {'transient', 'none', 0 , 0, 'nan' 0 };... - {'diagnostic', 'none', 0 , 0, 'nan' 1 };... - {'prognostic', 'none', 0 , 0, 'nan' 1 };... - {'thermal', 'steady', 0 , 0, 'nan' 1 };... - {'thermal', 'transient', 0 , 0, 'nan' 1 };... - {'transient', 'none', 0 , 0, 'nan' 1 };... +sequences={ {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {ThermalAnalysisEnum, SteadyAnalysisEnum, 0 , 0, 'nan' 0 };... + {ThermalAnalysisEnum, TransientAnalysisEnum, 0 , 0, 'nan' 0 };... + {TransientAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {ThermalAnalysisEnum, SteadyAnalysisEnum, 0 , 0, 'nan' 1 };... + {ThermalAnalysisEnum, TransientAnalysisEnum, 0 , 0, 'nan' 1 };... + {TransientAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... }; Index: /issm/trunk/test/Verification/test09_IceSheetIceFrontMP3d/configuration.m =================================================================== --- /issm/trunk/test/Verification/test09_IceSheetIceFrontMP3d/configuration.m (revision 3923) +++ /issm/trunk/test/Verification/test09_IceSheetIceFrontMP3d/configuration.m (revision 3924) @@ -23,9 +23,9 @@ %sequences analysis sub_analysis qmu control control_fit parallel -sequences={ {'prognostic', 'none', 0 , 0, 'nan' 0 };... - {'thermal', 'steady', 0 , 0, 'nan' 0 };... - {'thermal', 'transient', 0 , 0, 'nan' 0 };... - {'prognostic', 'none', 0 , 0, 'nan' 1 };... - {'thermal', 'steady', 0 , 0, 'nan' 1 };... - {'thermal', 'transient', 0 , 0, 'nan' 1 };... +sequences={ {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {ThermalAnalysisEnum, SteadyAnalysisEnum, 0 , 0, 'nan' 0 };... + {ThermalAnalysisEnum, TransientAnalysisEnum, 0 , 0, 'nan' 0 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {ThermalAnalysisEnum, SteadyAnalysisEnum, 0 , 0, 'nan' 1 };... + {ThermalAnalysisEnum, TransientAnalysisEnum, 0 , 0, 'nan' 1 };... }; Index: /issm/trunk/test/Verification/test10_IceSheetIceFrontP3d/configuration.m =================================================================== --- /issm/trunk/test/Verification/test10_IceSheetIceFrontP3d/configuration.m (revision 3923) +++ /issm/trunk/test/Verification/test10_IceSheetIceFrontP3d/configuration.m (revision 3924) @@ -23,13 +23,13 @@ %sequences analysis sub_analysis qmu control control_fit parallel -sequences={ {'diagnostic', 'none', 0 , 0, 'nan' 0 };... - {'prognostic', 'none', 0 , 0, 'nan' 0 };... - {'thermal', 'steady', 0 , 0, 'nan' 0 };... - {'thermal', 'transient', 0 , 0, 'nan' 0 };... - {'transient', 'none', 0 , 0, 'nan' 0 };... - {'diagnostic', 'none', 0 , 0, 'nan' 1 };... - {'prognostic', 'none', 0 , 0, 'nan' 1 };... - {'thermal', 'steady', 0 , 0, 'nan' 1 };... - {'thermal', 'transient', 0 , 0, 'nan' 1 };... - {'transient', 'none', 0 , 0, 'nan' 1 };... +sequences={ {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {ThermalAnalysisEnum, SteadyAnalysisEnum, 0 , 0, 'nan' 0 };... + {ThermalAnalysisEnum, TransientAnalysisEnum, 0 , 0, 'nan' 0 };... + {TransientAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {ThermalAnalysisEnum, SteadyAnalysisEnum, 0 , 0, 'nan' 1 };... + {ThermalAnalysisEnum, TransientAnalysisEnum, 0 , 0, 'nan' 1 };... + {TransientAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... }; Index: /issm/trunk/test/Verification/test11_IceSheetIceFrontS3d/configuration.m =================================================================== --- /issm/trunk/test/Verification/test11_IceSheetIceFrontS3d/configuration.m (revision 3923) +++ /issm/trunk/test/Verification/test11_IceSheetIceFrontS3d/configuration.m (revision 3924) @@ -23,11 +23,11 @@ %sequences analysis sub_analysis qmu control control_fit parallel -sequences={ {'diagnostic', 'none', 0 , 0, 'nan' 0 };... - {'prognostic', 'none', 0 , 0, 'nan' 0 };... - {'thermal', 'steady', 0 , 0, 'nan' 0 };... - {'thermal', 'transient', 0 , 0, 'nan' 0 };... - {'diagnostic', 'none', 0 , 0, 'nan' 1 };... - {'prognostic', 'none', 0 , 0, 'nan' 1 };... - {'thermal', 'steady', 0 , 0, 'nan' 1 };... - {'thermal', 'transient', 0 , 0, 'nan' 1 };... +sequences={ {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {ThermalAnalysisEnum, SteadyAnalysisEnum, 0 , 0, 'nan' 0 };... + {ThermalAnalysisEnum, TransientAnalysisEnum, 0 , 0, 'nan' 0 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {ThermalAnalysisEnum, SteadyAnalysisEnum, 0 , 0, 'nan' 1 };... + {ThermalAnalysisEnum, TransientAnalysisEnum, 0 , 0, 'nan' 1 };... }; Index: /issm/trunk/test/Verification/test12_IceSheetNoIceFrontH2d/configuration.m =================================================================== --- /issm/trunk/test/Verification/test12_IceSheetNoIceFrontH2d/configuration.m (revision 3923) +++ /issm/trunk/test/Verification/test12_IceSheetNoIceFrontH2d/configuration.m (revision 3924) @@ -23,9 +23,9 @@ %sequences analysis sub_analysis qmu control control_fit parallel -sequences={ {'diagnostic', 'none', 0 , 0, 'nan' 0 };... - {'prognostic', 'none', 0 , 0, 'nan' 0 };... - {'transient', 'none', 0 , 0, 'nan' 0 };... - {'diagnostic', 'none', 0 , 0, 'nan' 1 };... - {'prognostic', 'none', 0 , 0, 'nan' 1 };... - {'transient', 'none', 0 , 0, 'nan' 1 };... +sequences={ {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {TransientAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {TransientAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... }; Index: /issm/trunk/test/Verification/test13_IceSheetNoIceFrontH3d/configuration.m =================================================================== --- /issm/trunk/test/Verification/test13_IceSheetNoIceFrontH3d/configuration.m (revision 3923) +++ /issm/trunk/test/Verification/test13_IceSheetNoIceFrontH3d/configuration.m (revision 3924) @@ -23,13 +23,13 @@ %sequences analysis sub_analysis qmu control control_fit parallel -sequences={ {'diagnostic', 'none', 0 , 0, 'nan' 0 };... - {'prognostic', 'none', 0 , 0, 'nan' 0 };... - {'thermal', 'steady', 0 , 0, 'nan' 0 };... - {'thermal', 'transient', 0 , 0, 'nan' 0 };... - {'transient', 'none', 0 , 0, 'nan' 0 };... - {'diagnostic', 'none', 0 , 0, 'nan' 1 };... - {'prognostic', 'none', 0 , 0, 'nan' 1 };... - {'thermal', 'steady', 0 , 0, 'nan' 1 };... - {'thermal', 'transient', 0 , 0, 'nan' 1 };... - {'transient', 'none', 0 , 0, 'nan' 1 };... +sequences={ {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {ThermalAnalysisEnum, SteadyAnalysisEnum, 0 , 0, 'nan' 0 };... + {ThermalAnalysisEnum, TransientAnalysisEnum, 0 , 0, 'nan' 0 };... + {TransientAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {ThermalAnalysisEnum, SteadyAnalysisEnum, 0 , 0, 'nan' 1 };... + {ThermalAnalysisEnum, TransientAnalysisEnum, 0 , 0, 'nan' 1 };... + {TransientAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... }; Index: /issm/trunk/test/Verification/test14_IceSheetNoIceFrontHM2d/configuration.m =================================================================== --- /issm/trunk/test/Verification/test14_IceSheetNoIceFrontHM2d/configuration.m (revision 3923) +++ /issm/trunk/test/Verification/test14_IceSheetNoIceFrontHM2d/configuration.m (revision 3924) @@ -23,9 +23,9 @@ %sequences analysis sub_analysis qmu control control_fit parallel -sequences={ {'diagnostic', 'none', 0 , 0, 'nan' 0 };... - {'prognostic', 'none', 0 , 0, 'nan' 0 };... - {'transient', 'none', 0 , 0, 'nan' 0 };... - {'diagnostic', 'none', 0 , 0, 'nan' 1 };... - {'prognostic', 'none', 0 , 0, 'nan' 1 };... - {'transient', 'none', 0 , 0, 'nan' 1 };... +sequences={ {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {TransientAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {TransientAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... }; Index: /issm/trunk/test/Verification/test15_IceSheetNoIceFrontHM3d/configuration.m =================================================================== --- /issm/trunk/test/Verification/test15_IceSheetNoIceFrontHM3d/configuration.m (revision 3923) +++ /issm/trunk/test/Verification/test15_IceSheetNoIceFrontHM3d/configuration.m (revision 3924) @@ -23,11 +23,11 @@ %sequences analysis sub_analysis qmu control control_fit parallel -sequences={ {'diagnostic', 'none', 0 , 0, 'nan' 0 };... - {'prognostic', 'none', 0 , 0, 'nan' 0 };... - {'thermal', 'steady', 0 , 0, 'nan' 0 };... - {'thermal', 'transient', 0 , 0, 'nan' 0 };... - {'diagnostic', 'none', 0 , 0, 'nan' 1 };... - {'prognostic', 'none', 0 , 0, 'nan' 1 };... - {'thermal', 'steady', 0 , 0, 'nan' 1 };... - {'thermal', 'transient', 0 , 0, 'nan' 1 };... +sequences={ {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {ThermalAnalysisEnum, SteadyAnalysisEnum, 0 , 0, 'nan' 0 };... + {ThermalAnalysisEnum, TransientAnalysisEnum, 0 , 0, 'nan' 0 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {ThermalAnalysisEnum, SteadyAnalysisEnum, 0 , 0, 'nan' 1 };... + {ThermalAnalysisEnum, TransientAnalysisEnum, 0 , 0, 'nan' 1 };... }; Index: /issm/trunk/test/Verification/test16_IceSheetNoIceFrontM2d/configuration.m =================================================================== --- /issm/trunk/test/Verification/test16_IceSheetNoIceFrontM2d/configuration.m (revision 3923) +++ /issm/trunk/test/Verification/test16_IceSheetNoIceFrontM2d/configuration.m (revision 3924) @@ -23,9 +23,9 @@ %sequences analysis sub_analysis qmu control control_fit parallel -sequences={ {'diagnostic', 'none', 0 , 0, 'nan' 0 };... - {'prognostic', 'none', 0 , 0, 'nan' 0 };... - {'transient', 'none', 0 , 0, 'nan' 0 };... - {'diagnostic', 'none', 0 , 0, 'nan' 1 };... - {'prognostic', 'none', 0 , 0, 'nan' 1 };... - {'transient', 'none', 0 , 0, 'nan' 1 };... +sequences={ {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {TransientAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {TransientAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... }; Index: /issm/trunk/test/Verification/test17_IceSheetNoIceFrontM3d/configuration.m =================================================================== --- /issm/trunk/test/Verification/test17_IceSheetNoIceFrontM3d/configuration.m (revision 3923) +++ /issm/trunk/test/Verification/test17_IceSheetNoIceFrontM3d/configuration.m (revision 3924) @@ -23,13 +23,13 @@ %sequences analysis sub_analysis qmu control control_fit parallel -sequences={ {'diagnostic', 'none', 0 , 0, 'nan' 0 };... - {'prognostic', 'none', 0 , 0, 'nan' 0 };... - {'thermal', 'steady', 0 , 0, 'nan' 0 };... - {'thermal', 'transient', 0 , 0, 'nan' 0 };... - {'transient', 'none', 0 , 0, 'nan' 0 };... - {'diagnostic', 'none', 0 , 0, 'nan' 1 };... - {'prognostic', 'none', 0 , 0, 'nan' 1 };... - {'thermal', 'steady', 0 , 0, 'nan' 1 };... - {'thermal', 'transient', 0 , 0, 'nan' 1 };... - {'transient', 'none', 0 , 0, 'nan' 1 };... +sequences={ {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {ThermalAnalysisEnum, SteadyAnalysisEnum, 0 , 0, 'nan' 0 };... + {ThermalAnalysisEnum, TransientAnalysisEnum, 0 , 0, 'nan' 0 };... + {TransientAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {ThermalAnalysisEnum, SteadyAnalysisEnum, 0 , 0, 'nan' 1 };... + {ThermalAnalysisEnum, TransientAnalysisEnum, 0 , 0, 'nan' 1 };... + {TransientAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... }; Index: /issm/trunk/test/Verification/test18_IceSheetNoIceFrontP3d/configuration.m =================================================================== --- /issm/trunk/test/Verification/test18_IceSheetNoIceFrontP3d/configuration.m (revision 3923) +++ /issm/trunk/test/Verification/test18_IceSheetNoIceFrontP3d/configuration.m (revision 3924) @@ -23,13 +23,13 @@ %sequences analysis sub_analysis qmu control control_fit parallel -sequences={ {'diagnostic', 'none', 0 , 0, 'nan' 0 };... - {'prognostic', 'none', 0 , 0, 'nan' 0 };... - {'thermal', 'steady', 0 , 0, 'nan' 0 };... - {'thermal', 'transient', 0 , 0, 'nan' 0 };... - {'transient', 'none', 0 , 0, 'nan' 0 };... - {'diagnostic', 'none', 0 , 0, 'nan' 1 };... - {'prognostic', 'none', 0 , 0, 'nan' 1 };... - {'thermal', 'steady', 0 , 0, 'nan' 1 };... - {'thermal', 'transient', 0 , 0, 'nan' 1 };... - {'transient', 'none', 0 , 0, 'nan' 1 };... +sequences={ {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {ThermalAnalysisEnum, SteadyAnalysisEnum, 0 , 0, 'nan' 0 };... + {ThermalAnalysisEnum, TransientAnalysisEnum, 0 , 0, 'nan' 0 };... + {TransientAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {ThermalAnalysisEnum, SteadyAnalysisEnum, 0 , 0, 'nan' 1 };... + {ThermalAnalysisEnum, TransientAnalysisEnum, 0 , 0, 'nan' 1 };... + {TransientAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... }; Index: /issm/trunk/test/Verification/test19_IceSheetNoIceFrontS3d/configuration.m =================================================================== --- /issm/trunk/test/Verification/test19_IceSheetNoIceFrontS3d/configuration.m (revision 3923) +++ /issm/trunk/test/Verification/test19_IceSheetNoIceFrontS3d/configuration.m (revision 3924) @@ -23,11 +23,11 @@ %sequences analysis sub_analysis qmu control control_fit parallel -sequences={ {'diagnostic', 'none', 0 , 0, 'nan' 0 };... - {'prognostic', 'none', 0 , 0, 'nan' 0 };... - {'thermal', 'steady', 0 , 0, 'nan' 0 };... - {'thermal', 'transient', 0 , 0, 'nan' 0 };... - {'diagnostic', 'none', 0 , 0, 'nan' 1 };... - {'prognostic', 'none', 0 , 0, 'nan' 1 };... - {'thermal', 'steady', 0 , 0, 'nan' 1 };... - {'thermal', 'transient', 0 , 0, 'nan' 1 };... +sequences={ {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {ThermalAnalysisEnum, SteadyAnalysisEnum, 0 , 0, 'nan' 0 };... + {ThermalAnalysisEnum, TransientAnalysisEnum, 0 , 0, 'nan' 0 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {PrognosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {ThermalAnalysisEnum, SteadyAnalysisEnum, 0 , 0, 'nan' 1 };... + {ThermalAnalysisEnum, TransientAnalysisEnum, 0 , 0, 'nan' 1 };... }; Index: /issm/trunk/test/Verification/test20_PigControlMethodDragM2d/configuration.m =================================================================== --- /issm/trunk/test/Verification/test20_PigControlMethodDragM2d/configuration.m (revision 3923) +++ /issm/trunk/test/Verification/test20_PigControlMethodDragM2d/configuration.m (revision 3924) @@ -23,9 +23,9 @@ %sequences analysis sub_analysis qmu control control_fit parallel -sequences={ {'diagnostic', 'none', 0 , 1, 'absolute', 0 };... - {'diagnostic', 'none', 0 , 1, 'relative', 0 };... - {'diagnostic', 'none', 0 , 1, 'logarithmic', 0 };... - {'diagnostic', 'none', 0 , 1, 'absolute', 1 };... - {'diagnostic', 'none', 0 , 1, 'relative', 1 };... - {'diagnostic', 'none', 0 , 1, 'logarithmic', 1 };... +sequences={ {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 1, 'absolute', 0 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 1, 'relative', 0 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 1, 'logarithmic', 0 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 1, 'absolute', 1 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 1, 'relative', 1 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 1, 'logarithmic', 1 };... }; Index: /issm/trunk/test/Verification/test21_PigControlMethodBM2d/configuration.m =================================================================== --- /issm/trunk/test/Verification/test21_PigControlMethodBM2d/configuration.m (revision 3923) +++ /issm/trunk/test/Verification/test21_PigControlMethodBM2d/configuration.m (revision 3924) @@ -23,9 +23,9 @@ %sequences analysis sub_analysis qmu control control_fit parallel -sequences={ {'diagnostic', 'none', 0 , 1, 'absolute', 0 };... - {'diagnostic', 'none', 0 , 1, 'relative', 0 };... - {'diagnostic', 'none', 0 , 1, 'logarithmic', 0 };... - {'diagnostic', 'none', 0 , 1, 'absolute', 1 };... - {'diagnostic', 'none', 0 , 1, 'relative', 1 };... - {'diagnostic', 'none', 0 , 1, 'logarithmic', 1 };... +sequences={ {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 1, 'absolute', 0 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 1, 'relative', 0 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 1, 'logarithmic', 0 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 1, 'absolute', 1 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 1, 'relative', 1 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 1, 'logarithmic', 1 };... }; Index: /issm/trunk/test/Verification/test22_PigControlMethodDragP3d/configuration.m =================================================================== --- /issm/trunk/test/Verification/test22_PigControlMethodDragP3d/configuration.m (revision 3923) +++ /issm/trunk/test/Verification/test22_PigControlMethodDragP3d/configuration.m (revision 3924) @@ -23,7 +23,7 @@ %sequences analysis sub_analysis qmu control control_fit parallel -sequences={ {'diagnostic', 'none', 0 , 1, 'absolute', 1 };... - {'diagnostic', 'none', 0 , 1, 'relative', 1 };... - {'diagnostic', 'none', 0 , 1, 'logarithmic', 1 };... - {'steadystate', 'none', 0 , 1, 'absolute', 1 };... +sequences={ {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 1, 'absolute', 1 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 1, 'relative', 1 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 1, 'logarithmic', 1 };... + {'steadystate', NoneAnalysisEnum, 0 , 1, 'absolute', 1 };... }; Index: /issm/trunk/test/Verification/test23_PigControlMethodDragS3d/configuration.m =================================================================== --- /issm/trunk/test/Verification/test23_PigControlMethodDragS3d/configuration.m (revision 3923) +++ /issm/trunk/test/Verification/test23_PigControlMethodDragS3d/configuration.m (revision 3924) @@ -23,4 +23,4 @@ %sequences analysis sub_analysis qmu control control_fit parallel -sequences={ {'diagnostic', 'none', 0 , 1, 'absolute', 1 };... +sequences={ {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 1, 'absolute', 1 };... }; Index: /issm/trunk/test/Verification/test24_IceShelfIceFrontM2dRifts/configuration.m =================================================================== --- /issm/trunk/test/Verification/test24_IceShelfIceFrontM2dRifts/configuration.m (revision 3923) +++ /issm/trunk/test/Verification/test24_IceShelfIceFrontM2dRifts/configuration.m (revision 3924) @@ -23,5 +23,5 @@ %sequences analysis sub_analysis qmu control control_fit parallel -sequences={ {'diagnostic', 'none', 0 , 0, 'nan' 0 };... - {'diagnostic', 'none', 0 , 0, 'nan' 1 };... +sequences={ {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... }; Index: /issm/trunk/test/Verification/test25_IceSheetIceFrontM2dDakota/configuration.m =================================================================== --- /issm/trunk/test/Verification/test25_IceSheetIceFrontM2dDakota/configuration.m (revision 3923) +++ /issm/trunk/test/Verification/test25_IceSheetIceFrontM2dDakota/configuration.m (revision 3924) @@ -23,5 +23,5 @@ %sequences analysis sub_analysis qmu control control_fit parallel -sequences={ {'diagnostic', 'none', 1 , 0, 'nan' 0 };... - {'diagnostic', 'none', 1 , 0, 'nan' 1 };... +sequences={ {DiagnosticAnalysisEnum, NoneAnalysisEnum, 1 , 0, 'nan' 0 };... + {DiagnosticAnalysisEnum, NoneAnalysisEnum, 1 , 0, 'nan' 1 };... }; Index: /issm/trunk/test/Verification/test26_Balanced2d/configuration.m =================================================================== --- /issm/trunk/test/Verification/test26_Balanced2d/configuration.m (revision 3923) +++ /issm/trunk/test/Verification/test26_Balanced2d/configuration.m (revision 3924) @@ -23,9 +23,9 @@ %sequences analysis sub_analysis qmu control control_fit parallel -sequences={ {'balancedthickness', 'none', 0 , 0, 'nan' 0 };... - {'slopecompute', 'none', 0 , 0, 'nan' 0 };... - {'prognostic2', 'none', 0 , 0, 'nan' 0 };... - {'balancedthickness', 'none', 0 , 0, 'nan' 1 };... - {'slopecompute', 'none', 0 , 0, 'nan' 1 };... - {'prognostic2', 'none', 0 , 0, 'nan' 1 };... +sequences={ {BalancedthicknessAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {'slopecompute', NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {Prognostic2AnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {BalancedthicknessAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {'slopecompute', NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {Prognostic2AnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... }; Index: /issm/trunk/test/Verification/test27_Balanced3d/configuration.m =================================================================== --- /issm/trunk/test/Verification/test27_Balanced3d/configuration.m (revision 3923) +++ /issm/trunk/test/Verification/test27_Balanced3d/configuration.m (revision 3924) @@ -23,7 +23,7 @@ %sequences analysis sub_analysis qmu control control_fit parallel -sequences={ {'balancedthickness', 'none', 0 , 0, 'nan' 0 };... - {'slopecompute', 'none', 0 , 0, 'nan' 0 };... - {'balancedthickness', 'none', 0 , 0, 'nan' 1 };... - {'slopecompute', 'none', 0 , 0, 'nan' 1 };... +sequences={ {BalancedthicknessAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {'slopecompute', NoneAnalysisEnum, 0 , 0, 'nan' 0 };... + {BalancedthicknessAnalysisEnum, NoneAnalysisEnum, 0 , 0, 'nan' 1 };... + {'slopecompute', NoneAnalysisEnum, 0 , 0, 'nan' 1 };... };