Changeset 487


Ignore:
Timestamp:
05/19/09 12:29:05 (15 years ago)
Author:
Mathieu Morlighem
Message:

removed useless checks

Location:
issm/trunk/test/Verification
Files:
42 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/test/Verification/IceSheetIceFrontM2d_7/runme.m

    r482 r487  
    3030                solution=solutions{j};
    3131
    32                 %check package
    33                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    34                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    35                 %check solution
    36                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'prognostic'));
    37                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    38                 end
    3932                %check solution requested
    4033                if (~strcmpi(package,'ice') & strcmpi(solution,'prognostic')),
  • issm/trunk/test/Verification/IceSheetIceFrontM2d_7/updatearchive.m

    r482 r487  
    2323                solution=solutions{j};
    2424
    25                 %check package
    26                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    27                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    28                         %check solution
    29                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'prognostic'));
    30                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    31                 end
    3225                %check solution requested
    3326                if (~strcmpi(package,'ice') & strcmpi(solution,'prognostic')),
  • issm/trunk/test/Verification/IceSheetIceFrontM3d_8/runme.m

    r482 r487  
    3030                solution=solutions{j};
    3131
    32                 %check package
    33                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    34                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    35                 %check solution
    36                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
    37                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
    38                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    39                 end
    4032                %check solution requested
    41                 if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
     33                if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
    4234                        disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
    4335                        continue
  • issm/trunk/test/Verification/IceSheetIceFrontM3d_8/updatearchive.m

    r482 r487  
    2323                solution=solutions{j};
    2424
    25                 %check package
    26                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    27                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    28                         %check solution
    29                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
    30                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
    31                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    32                 end
    3325                %check solution requested
    34                 if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
     26                if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
    3527                        disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
    3628                        continue
  • issm/trunk/test/Verification/IceSheetIceFrontMP3d_9/runme.m

    r482 r487  
    3030                solution=solutions{j};
    3131
    32                 %check package
    33                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    34                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    35                 %check solution
    36                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
    37                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
    38                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    39                 end
    4032                %check solution requested
    41                 if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
     33                if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
    4234                        disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
    4335                        continue
  • issm/trunk/test/Verification/IceSheetIceFrontMP3d_9/updatearchive.m

    r482 r487  
    2323                solution=solutions{j};
    2424
    25                 %check package
    26                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    27                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    28                         %check solution
    29                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
    30                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
    31                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    32                 end
    33                 %check solution requested
    34                 if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
     25                if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
    3526                        disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
    3627                        continue
  • issm/trunk/test/Verification/IceSheetIceFrontP3d_10/runme.m

    r482 r487  
    3030                solution=solutions{j};
    3131
    32                 %check package
    33                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    34                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    35                 %check solution
    36                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
    37                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
    38                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    39                 end
    4032                %check solution requested
    41                 if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
     33                if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
    4234                        disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
    4335                        continue
  • issm/trunk/test/Verification/IceSheetIceFrontP3d_10/updatearchive.m

    r482 r487  
    2323                solution=solutions{j};
    2424
    25                 %check package
    26                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    27                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    28                         %check solution
    29                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
    30                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
    31                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    32                 end
    3325                %check solution requested
    34                 if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
     26                if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
    3527                        disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
    3628                        continue
  • issm/trunk/test/Verification/IceSheetIceFrontS3d_11/runme.m

    r482 r487  
    3030                solution=solutions{j};
    3131
    32                 %check package
    33                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    34                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    35                 %check solution
    36                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
    37                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
    38                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    39                 end
    4032                %check solution requested
    4133                if (~strcmpi(package,'ice') | strcmpi(solution,'transient')),
  • issm/trunk/test/Verification/IceSheetIceFrontS3d_11/updatearchive.m

    r482 r487  
    2323                solution=solutions{j};
    2424
    25                 %check package
    26                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    27                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    28                         %check solution
    29                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
    30                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
    31                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    32                 end
    3325                %check solution requested
    3426                if (~strcmpi(package,'ice') | strcmpi(solution,'transient')),
  • issm/trunk/test/Verification/IceSheetNoIceFrontH2d_12/runme.m

    r482 r487  
    3030                solution=solutions{j};
    3131
    32                 %check package
    33                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    34                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    35                 %check solution
    36                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'prognostic'));
    37                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    38                 end
    3932                %check solution requested
    40                 if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) ),
     33                if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) ),
    4134                        disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
    4235                        continue
  • issm/trunk/test/Verification/IceSheetNoIceFrontH2d_12/updatearchive.m

    r482 r487  
    2323                solution=solutions{j};
    2424
    25                 %check package
    26                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    27                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    28                         %check solution
    29                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'prognostic'));
    30                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    31                 end
    3225                %check solution requested
    33                 if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) ),
     26                if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) ),
    3427                        disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
    3528                        continue
  • issm/trunk/test/Verification/IceSheetNoIceFrontH3d_13/runme.m

    r482 r487  
    3030                solution=solutions{j};
    3131
    32                 %check package
    33                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    34                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    35                 %check solution
    36                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
    37                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
    38                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    39                 end
    4032                %check solution requested
    41                 if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
     33                if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
    4234                        disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
    4335                        continue
  • issm/trunk/test/Verification/IceSheetNoIceFrontH3d_13/updatearchive.m

    r482 r487  
    2323                solution=solutions{j};
    2424
    25                 %check package
    26                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    27                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    28                         %check solution
    29                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
    30                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
    31                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    32                 end
    3325                %check solution requested
    34                 if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
     26                if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
    3527                        disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
    3628                        continue
  • issm/trunk/test/Verification/IceSheetNoIceFrontHM2d_14/runme.m

    r482 r487  
    3030                solution=solutions{j};
    3131
    32                 %check package
    33                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    34                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    35                 %check solution
    36                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'prognostic'));
    37                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    38                 end
    3932                %check solution requested
    4033                if (~strcmpi(package,'ice')),
  • issm/trunk/test/Verification/IceSheetNoIceFrontHM2d_14/updatearchive.m

    r482 r487  
    2323                solution=solutions{j};
    2424
    25                 %check package
    26                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    27                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    28                         %check solution
    29                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'prognostic'));
    30                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    31                 end
    3225                %check solution requested
    3326                if (~strcmpi(package,'ice')),
  • issm/trunk/test/Verification/IceSheetNoIceFrontHM3d_15/runme.m

    r482 r487  
    3030                solution=solutions{j};
    3131
    32                 %check package
    33                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    34                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    35                 %check solution
    36                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
    37                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
    38                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    39                 end
    4032                %check solution requested
    4133                if (~strcmpi(package,'ice') | strcmpi(solution,'transient')),
  • issm/trunk/test/Verification/IceSheetNoIceFrontHM3d_15/updatearchive.m

    r482 r487  
    2323                solution=solutions{j};
    2424
    25                 %check package
    26                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    27                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    28                         %check solution
    29                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
    30                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
    31                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    32                 end
    3325                %check solution requested
    3426                if (~strcmpi(package,'ice') | strcmpi(solution,'transient')),
  • issm/trunk/test/Verification/IceSheetNoIceFrontM2d_16/runme.m

    r482 r487  
    3030                solution=solutions{j};
    3131
    32                 %check package
    33                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    34                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    35                 %check solution
    36                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'prognostic'));
    37                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    38                 end
    3932                %check solution requested
    4033                if (~strcmpi(package,'ice') & strcmpi(solution,'prognostic')),
  • issm/trunk/test/Verification/IceSheetNoIceFrontM2d_16/updatearchive.m

    r482 r487  
    2323                solution=solutions{j};
    2424
    25                 %check package
    26                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    27                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    28                         %check solution
    29                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'prognostic'));
    30                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    31                 end
    3225                %check solution requested
    3326                if (~strcmpi(package,'ice') & strcmpi(solution,'prognostic')),
  • issm/trunk/test/Verification/IceSheetNoIceFrontM3d_17/runme.m

    r482 r487  
    3030                solution=solutions{j};
    3131
    32                 %check package
    33                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    34                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    35                 %check solution
    36                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
    37                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
    38                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    39                 end
    4032                %check solution requested
    41                 if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
     33                if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
    4234                        disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
    4335                        continue
  • issm/trunk/test/Verification/IceSheetNoIceFrontM3d_17/updatearchive.m

    r482 r487  
    2323                solution=solutions{j};
    2424
    25                 %check package
    26                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    27                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    28                         %check solution
    29                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
    30                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
    31                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    32                 end
    3325                %check solution requested
    34                 if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
     26                if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
    3527                        disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
    3628                        continue
  • issm/trunk/test/Verification/IceSheetNoIceFrontP3d_18/runme.m

    r482 r487  
    3030                solution=solutions{j};
    3131
    32                 %check package
    33                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    34                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    35                 %check solution
    36                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
    37                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
    38                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    39                 end
    4032                %check solution requested
    41                 if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
     33                if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
    4234                        disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
    4335                        continue
  • issm/trunk/test/Verification/IceSheetNoIceFrontP3d_18/updatearchive.m

    r482 r487  
    2323                solution=solutions{j};
    2424
    25                 %check package
    26                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    27                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    28                         %check solution
    29                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
    30                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
    31                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    32                 end
    3325                %check solution requested
    34                 if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
     26                if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
    3527                        disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
    3628                        continue
  • issm/trunk/test/Verification/IceSheetNoIceFrontS3d_19/runme.m

    r482 r487  
    3030                solution=solutions{j};
    3131
    32                 %check package
    33                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    34                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    35                 %check solution
    36                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
    37                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
    38                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    39                 end
    4032                %check solution requested
    4133                if (~strcmpi(package,'ice') | strcmpi(solution,'transient')),
  • issm/trunk/test/Verification/IceSheetNoIceFrontS3d_19/updatearchive.m

    r482 r487  
    2323                solution=solutions{j};
    2424
    25                 %check package
    26                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    27                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    28                         %check solution
    29                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
    30                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
    31                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    32                 end
    3325                %check solution requested
    3426                if (~strcmpi(package,'ice') | strcmpi(solution,'transient')),
  • issm/trunk/test/Verification/IceShelfIceFrontM2d_1/runme.m

    r482 r487  
    3030                solution=solutions{j};
    3131
    32                 %check package
    33                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    34                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    35                 %check solution
    36                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'prognostic'));
    37                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    38                 end
    3932                %check solution requested
    4033                if (~strcmpi(package,'ice') & strcmpi(solution,'prognostic')),
  • issm/trunk/test/Verification/IceShelfIceFrontM2d_1/updatearchive.m

    r482 r487  
    2323                solution=solutions{j};
    2424
    25                 %check package
    26                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    27                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    28                         %check solution
    29                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'prognostic'));
    30                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    31                 end
    3225                %check solution requested
    3326                if (~strcmpi(package,'ice') & strcmpi(solution,'prognostic')),
  • issm/trunk/test/Verification/IceShelfIceFrontM3d_2/runme.m

    r482 r487  
    3030                solution=solutions{j};
    3131
    32                 %check package
    33                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    34                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    35                 %check solution
    36                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
    37                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
    38                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    39                 end
    4032                %check solution requested
    41                 if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
     33                if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
    4234                        disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
    4335                        continue
  • issm/trunk/test/Verification/IceShelfIceFrontM3d_2/updatearchive.m

    r482 r487  
    2323                solution=solutions{j};
    2424
    25                 %check package
    26                 if ~(strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    27                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    28                         %check solution
    29                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
    30                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
    31                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    32                 end
    3325                %check solution requested
    3426                if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
  • issm/trunk/test/Verification/IceShelfIceFrontMP3d_3/runme.m

    r482 r487  
    3030                solution=solutions{j};
    3131
    32                 %check package
    33                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    34                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    35                 %check solution
    36                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
    37                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
    38                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    39                 end
    4032                %check solution requested
    41                 if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
     33                if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
    4234                        disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
    4335                        continue
  • issm/trunk/test/Verification/IceShelfIceFrontMP3d_3/updatearchive.m

    r482 r487  
    2323                solution=solutions{j};
    2424
    25                 %check package
    26                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    27                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    28                         %check solution
    29                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
    30                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
    31                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    32                 end
    3325                %check solution requested
    34                 if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
     26                if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
    3527                        disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
    3628                        continue
  • issm/trunk/test/Verification/IceShelfIceFrontMPS3d_4/runme.m

    r482 r487  
    3030                solution=solutions{j};
    3131
    32                 %check package
    33                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    34                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    35                 %check solution
    36                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
    37                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
    38                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    39                 end
    4032                %check solution requested
    4133                if (~strcmpi(package,'ice') | strcmpi(solution,'transient')),
  • issm/trunk/test/Verification/IceShelfIceFrontMPS3d_4/updatearchive.m

    r482 r487  
    2323                solution=solutions{j};
    2424
    25                 %check package
    26                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    27                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    28                         %check solution
    29                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
    30                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
    31                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    32                 end
    3325                %check solution requested
    3426                if (~strcmpi(package,'ice') | strcmpi(solution,'transient')),
  • issm/trunk/test/Verification/IceShelfIceFrontP3d_5/runme.m

    r482 r487  
    3030                solution=solutions{j};
    3131
    32                 %check package
    33                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    34                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    35                 %check solution
    36                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
    37                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
    38                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    39                 end
    4032                %check solution requested
    41                 if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
     33                if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
    4234                        disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
    4335                        continue
  • issm/trunk/test/Verification/IceShelfIceFrontP3d_5/updatearchive.m

    r482 r487  
    2323                solution=solutions{j};
    2424
    25                 %check package
    26                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    27                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    28                         %check solution
    29                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
    30                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
    31                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    32                 end
    3325                %check solution requested
    34                 if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
     26                if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
    3527                        disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
    3628                        continue
  • issm/trunk/test/Verification/IceShelfIceFrontS3d_6/runme.m

    r482 r487  
    3030                solution=solutions{j};
    3131
    32                 %check package
    33                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    34                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    35                 %check solution
    36                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
    37                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
    38                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    39                 end
    4032                %check solution requested
    4133                if (~strcmpi(package,'ice') | strcmpi(solution,'transient')),
  • issm/trunk/test/Verification/IceShelfIceFrontS3d_6/updatearchive.m

    r482 r487  
    2323                solution=solutions{j};
    2424
    25                 %check package
    26                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    27                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    28                         %check solution
    29                 elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
    30                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
    31                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
    32                 end
    3325                %check solution requested
    3426                if (~strcmpi(package,'ice') | strcmpi(solution,'transient')),
  • issm/trunk/test/Verification/PigControlMethodBM2d_21/runme.m

    r482 r487  
    3030                misfit=misfits{j};
    3131
    32                 %check package
    33                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    34                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    35                         %check solution
    36                 elseif ~(strcmpi(misfit,'absolute') | strcmpi(misfit,'relative') | strcmpi(misfit,'logarithmic')),
    37                         error(['misfit: ' misfit  ' in test: ' testname  ' not supported yet']);
    38                 end
    3932                %check solution requested
    4033                if strcmpi(package,'macayeal') & ~strcmpi(misfit,'absolute')
  • issm/trunk/test/Verification/PigControlMethodBM2d_21/updatearchive.m

    r482 r487  
    2525                misfit=misfits{j};
    2626
    27                 %check package
    28                 if ~(strcmpi(package,'macayeal') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    29                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    30                         %check solution
    31                 elseif ~(strcmpi(misfit,'absolute') | strcmpi(misfit,'relative') | strcmpi(misfit,'logarithmic')),
    32                         error(['misfit: ' misfit  ' in test: ' testname  ' not supported yet']);
    33                 end
    3427                %check solution requested
    3528                if strcmpi(package,'macayeal') & ~strcmpi(misfit,'absolute')
  • issm/trunk/test/Verification/PigControlMethodDragM2d_20/runme.m

    r482 r487  
    3232                %check package
    3333                if ~(strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    34                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    35                         %check solution
    36                 elseif ~(strcmpi(misfit,'absolute') | strcmpi(misfit,'relative') | strcmpi(misfit,'logarithmic')),
    37                         error(['misfit: ' misfit  ' in test: ' testname  ' not supported yet']);
     34                        disp(['package: ' package  ' in test: ' testname  ' not supported yet']);
     35                        continue
    3836                end
    3937
  • issm/trunk/test/Verification/PigControlMethodDragM2d_20/updatearchive.m

    r482 r487  
    2727                %check package
    2828                if ~(strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
    29                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
    30                         %check solution
    31                 elseif ~(strcmpi(misfit,'absolute') | strcmpi(misfit,'relative') | strcmpi(misfit,'logarithmic')),
    32                         error(['misfit: ' misfit  ' in test: ' testname  ' not supported yet']);
     29                        disp(['package: ' package  ' in test: ' testname  ' not supported yet']);
     30                        continue
    3331                end
    3432
Note: See TracChangeset for help on using the changeset viewer.