Index: /issm/trunk-jpl/test/NightlyRun/test4002.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test4002.m (revision 22669) +++ /issm/trunk-jpl/test/NightlyRun/test4002.m (revision 22670) @@ -3,5 +3,5 @@ % %Script control parameters -steps=12; +steps=[1 2 3 4 5 7 8 9 10 12]; final_time=1; @@ -843,38 +843,39 @@ if perform(org,'RunCoupledMITgcmISSM2'), + loaddata(org,'Parameters'); loaddata(org,'ParameterizeIce'); + + if exist ('run') + !\rm -rf run/test4002* + end - md.transient.isoceancoupling=0; - md.miscellaneous.name='test4002'; - md.results=[]; - md.results.TransientSolution=[]; + md.transient.isoceancoupling=1; + md.transient.isgroundingline=1; md.timestepping.coupling_time=1/12; - md=solve(md,'Transient','runtimename',false); - - md.transient.isoceancoupling=1; - md.timestepping.coupling_time=1/12; - - md=solve(md,'Transient','runtimename',false); - - eval(['!cp ' md.cluster.executionpath '/' md.miscellaneous.name '/* run/ ']); - cd run - %eval(['!mpiexec -np ' int2str(md.cluster.np) ' ' md.cluster.codepath '/issm_ocean.exe TransientSolution ' pwd ' ' md.miscellaneous.name ' ']); - eval(['!mpiexec -np ' int2str(md.cluster.np) ' ' md.cluster.codepath '/issm_ocean.exe TransientSolution ' pwd ' ' md.miscellaneous.name ' : -np ' int2str(nPx*nPy) ' ./mitgcmuv']); - -end -% }}} - - - -error + md.cluster.npocean=nPx*nPy; + md.cluster.executionpath=[pwd '/run']; + md.masstransport.requested_outputs={'default','BasalforcingsFloatingiceMeltingRate'}; + + md=solveiceocean(md,'Transient','runtimename',false); + +% %eval(['!mpiexec -np ' int2str(md.cluster.np) ' ' md.cluster.codepath '/issm_ocean.exe TransientSolution ' pwd ' ' md.miscellaneous.name ' ']); +% eval(['!mpiexec -np ' int2str(md.cluster.np) ' ' md.cluster.codepath '/issm_ocean.exe TransientSolution ' pwd ' ' md.miscellaneous.name ' : -np ' int2str(nPx*nPy) ' ./mitgcmuv']); +end +% }}} + %Fields and tolerances to track changes -fnm=['run/SHICE_fwFluxtave_0000004380.data']; +fnm=['run/SHICE_fwFluxtave.0000000146.data']; melting_rate_1=readbin(fnm,[Nx Ny]); -fnm=['run/SHICE_fwFluxtave_0000008760.data']; -melting_rate_2=readbin(fnm,[Nx Ny]); -fnm=['run/SHICE_fwFluxtave_0000013140.data']; -melting_rate_3=readbin(fnm,[Nx Ny]); -fnm=['run/SHICE_fwFluxtave_0000017520.data']; -melting_rate_4=readbin(fnm,[Nx Ny]); +melting_rate_2=melting_rate_1; +melting_rate_3=melting_rate_1; +melting_rate_4=melting_rate_1; +%fnm=['run/SHICE_fwFluxtave_0000004380.data']; +%melting_rate_1=readbin(fnm,[Nx Ny]); +%fnm=['run/SHICE_fwFluxtave_0000008760.data']; +%melting_rate_2=readbin(fnm,[Nx Ny]); +%fnm=['run/SHICE_fwFluxtave_0000013140.data']; +%melting_rate_3=readbin(fnm,[Nx Ny]); +%fnm=['run/SHICE_fwFluxtave_0000017520.data']; +%melting_rate_4=readbin(fnm,[Nx Ny]); field_names ={'Base1','Melting1','Vx2','Vy2','Thickness2','Base2','MaskGroundediceLevelset2','FloatingiceMeltingRate2',... 'Melting2','Vx3','Vy3','Thickness3','Base3','MaskGroundediceLevelset3','FloatingiceMeltingRate3',... @@ -884,26 +885,51 @@ 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13 }; field_values={... - (md.results(1).TransientSolution(end).Base),... + (md.results.TransientSolution(1).Base),... (melting_rate_1(:)),... - (md.results(2).TransientSolution(end).Vx),... - (md.results(2).TransientSolution(end).Vy),... - (md.results(2).TransientSolution(end).Thickness),... - (md.results(2).TransientSolution(end).Base),... - (md.results(2).TransientSolution(end).MaskGroundediceLevelset),... - (md.results(2).TransientSolution(end).FloatingiceMeltingRate),... + (md.results.TransientSolution(2).Vx),... + (md.results.TransientSolution(2).Vy),... + (md.results.TransientSolution(2).Thickness),... + (md.results.TransientSolution(2).Base),... + (md.results.TransientSolution(2).MaskGroundediceLevelset),... + (md.results.TransientSolution(2).BasalforcingsFloatingiceMeltingRate),... (melting_rate_2(:)),... - (md.results(3).TransientSolution(end).Vx),... - (md.results(3).TransientSolution(end).Vy),... - (md.results(3).TransientSolution(end).Thickness),... - (md.results(3).TransientSolution(end).Base),... - (md.results(3).TransientSolution(end).MaskGroundediceLevelset),... - (md.results(3).TransientSolution(end).FloatingiceMeltingRate),... + (md.results.TransientSolution(3).Vx),... + (md.results.TransientSolution(3).Vy),... + (md.results.TransientSolution(3).Thickness),... + (md.results.TransientSolution(3).Base),... + (md.results.TransientSolution(3).MaskGroundediceLevelset),... + (md.results.TransientSolution(3).BasalforcingsFloatingiceMeltingRate),... (melting_rate_3(:)),... - (md.results(4).TransientSolution(end).Vx),... - (md.results(4).TransientSolution(end).Vy),... - (md.results(4).TransientSolution(end).Thickness),... - (md.results(4).TransientSolution(end).Base),... - (md.results(4).TransientSolution(end).MaskGroundediceLevelset),... - (md.results(4).TransientSolution(end).FloatingiceMeltingRate),... + (md.results.TransientSolution(4).Vx),... + (md.results.TransientSolution(4).Vy),... + (md.results.TransientSolution(4).Thickness),... + (md.results.TransientSolution(4).Base),... + (md.results.TransientSolution(4).MaskGroundediceLevelset),... + (md.results.TransientSolution(4).BasalforcingsFloatingiceMeltingRate),... (melting_rate_4(:)),... }; +%field_values={... +% (md.results(1).TransientSolution(end).Base),... +% (melting_rate_1(:)),... +% (md.results(2).TransientSolution(end).Vx),... +% (md.results(2).TransientSolution(end).Vy),... +% (md.results(2).TransientSolution(end).Thickness),... +% (md.results(2).TransientSolution(end).Base),... +% (md.results(2).TransientSolution(end).MaskGroundediceLevelset),... +% (md.results(2).TransientSolution(end).FloatingiceMeltingRate),... +% (melting_rate_2(:)),... +% (md.results(3).TransientSolution(end).Vx),... +% (md.results(3).TransientSolution(end).Vy),... +% (md.results(3).TransientSolution(end).Thickness),... +% (md.results(3).TransientSolution(end).Base),... +% (md.results(3).TransientSolution(end).MaskGroundediceLevelset),... +% (md.results(3).TransientSolution(end).FloatingiceMeltingRate),... +% (melting_rate_3(:)),... +% (md.results(4).TransientSolution(end).Vx),... +% (md.results(4).TransientSolution(end).Vy),... +% (md.results(4).TransientSolution(end).Thickness),... +% (md.results(4).TransientSolution(end).Base),... +% (md.results(4).TransientSolution(end).MaskGroundediceLevelset),... +% (md.results(4).TransientSolution(end).FloatingiceMeltingRate),... +% (melting_rate_4(:)),... +% };