Index: ../trunk-jpl/test/NightlyRun/test4002.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test4002.m (revision 22712) +++ ../trunk-jpl/test/NightlyRun/test4002.m (revision 22713) @@ -2,8 +2,8 @@ %ISSM/MITgcm coupled set-up % %Script control parameters -steps=[1 2 3 4 5 6 7 8 9 10 11]; -final_time=1; +steps=[1 2 3 4 5 6 7 8 9 10 11 12]; +final_time=1/365; %Organizer mkdir Models @@ -42,10 +42,10 @@ MITgcmDeltaT=600; % MITgcm time step in seconds y2s=31536000; % year to seconds conversion, i.e., seconds per year - % start_time, final_time, and time_step + % start_time and time_step start_time=0; % in decimal years - time_step=1/12; % coupling interval in decimal years - async_step_MITgcm_multiplier=1/30; % used to reduce run time for MItgcm + time_step=1/(365*24); % coupling interval in decimal years + async_step_MITgcm_multiplier=1; % used to reduce run time for MItgcm % bedrock/bathymetry hmax=1000; @@ -845,8 +845,7 @@ loaddata(org,'ParameterizeIce'); loaddata(org,'Bathymetry'); loaddata(org,'IceSheetGeometry'); - endtime = round(MITgcmDeltaT * ... - floor(time_step*y2s*async_step_MITgcm_multiplier/MITgcmDeltaT)); + endtime = round(MITgcmDeltaT * floor(final_time*y2s/MITgcmDeltaT)); % {{{ prepare MITgcm % rename previous run directory and create new one @@ -987,7 +986,9 @@ md.transient.isoceancoupling=1; md.transient.isgroundingline=1; - md.timestepping.coupling_time=1/12; + md.timestepping.coupling_time=time_step; + md.timestepping.time_step=time_step; + md.timestepping.final_time=final_time; md.cluster.npocean=nPx*nPy; md.cluster.executionpath=[pwd '/run']; md.masstransport.requested_outputs={'default','BasalforcingsFloatingiceMeltingRate'};