Changeset 661


Ignore:
Timestamp:
06/01/09 09:22:36 (15 years ago)
Author:
Mathieu Morlighem
Message:

fixed tests for MacAyeal package

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

Legend:

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

    r644 r661  
    3131
    3232                %check solution requested
    33                 if (~strcmpi(package,'ice') & strcmpi(solution,'transient')),
     33                if ((~strcmpi(package,'ice') & strcmpi(solution,'transient'))...
     34                        | (strcmpi(package,'macayeal') & ~strcmpi(solution,'diagnostic'))),
    3435                        disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
    3536                        continue
  • issm/trunk/test/Verification/IceSheetIceFrontM2d_7/updatearchive.m

    r621 r661  
    2424
    2525                %check solution requested
    26                 if (~strcmpi(package,'ice') & strcmpi(solution,'transient')),
     26                if ((~strcmpi(package,'ice') & strcmpi(solution,'transient'))...
     27                        | (strcmpi(package,'macayeal') & ~strcmpi(solution,'diagnostic'))),
    2728                        disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
    2829                        continue
  • issm/trunk/test/Verification/IceSheetNoIceFrontM2d_16/runme.m

    r644 r661  
    3131
    3232                %check solution requested
    33                 if (~strcmpi(package,'ice') & strcmpi(solution,'transient')),
     33                if ((~strcmpi(package,'ice') & strcmpi(solution,'transient'))...
     34                        | (strcmpi(package,'macayeal') & ~strcmpi(solution,'diagnostic'))),
    3435                        disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
    3536                        continue
  • issm/trunk/test/Verification/IceSheetNoIceFrontM2d_16/updatearchive.m

    r622 r661  
    2424
    2525                %check solution requested
    26                 if (~strcmpi(package,'ice') & strcmpi(solution,'transient')),
     26                if ((~strcmpi(package,'ice') & strcmpi(solution,'transient'))...
     27                        | (strcmpi(package,'macayeal') & ~strcmpi(solution,'diagnostic'))),
    2728                        disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
    2829                        continue
  • issm/trunk/test/Verification/IceShelfIceFrontM2d_1/runme.m

    r655 r661  
    3232                %check solution requested
    3333                if ((~strcmpi(package,'ice') & strcmpi(solution,'transient')) |...
    34                                 (strcmpi(package,'macayeal') & strcmpi(solution,'prognostic'))),
     34                                (strcmpi(package,'macayeal') & ~strcmpi(solution,'diagnostic'))),
    3535                        disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
    3636                        continue
  • issm/trunk/test/Verification/IceShelfIceFrontM2d_1/updatearchive.m

    r620 r661  
    2424
    2525                %check solution requested
    26                 if (~strcmpi(package,'ice') & strcmpi(solution,'transient')),
     26                if ((~strcmpi(package,'ice') & strcmpi(solution,'transient'))...
     27                        | (strcmpi(package,'macayeal') & ~strcmpi(solution,'diagnostic'))),
    2728                        disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
    2829                        continue
Note: See TracChangeset for help on using the changeset viewer.