source: issm/oecreview/Archive/21724-22754/ISSM-22712-22713.diff@ 22755

Last change on this file since 22755 was 22755, checked in by Mathieu Morlighem, 7 years ago

CHG: added 21724-22754

File size: 1.8 KB
RevLine 
[22755]1Index: ../trunk-jpl/test/NightlyRun/test4002.m
2===================================================================
3--- ../trunk-jpl/test/NightlyRun/test4002.m (revision 22712)
4+++ ../trunk-jpl/test/NightlyRun/test4002.m (revision 22713)
5@@ -2,8 +2,8 @@
6 %ISSM/MITgcm coupled set-up
7 %
8 %Script control parameters
9-steps=[1 2 3 4 5 6 7 8 9 10 11];
10-final_time=1;
11+steps=[1 2 3 4 5 6 7 8 9 10 11 12];
12+final_time=1/365;
13
14 %Organizer
15 mkdir Models
16@@ -42,10 +42,10 @@
17 MITgcmDeltaT=600; % MITgcm time step in seconds
18 y2s=31536000; % year to seconds conversion, i.e., seconds per year
19
20- % start_time, final_time, and time_step
21+ % start_time and time_step
22 start_time=0; % in decimal years
23- time_step=1/12; % coupling interval in decimal years
24- async_step_MITgcm_multiplier=1/30; % used to reduce run time for MItgcm
25+ time_step=1/(365*24); % coupling interval in decimal years
26+ async_step_MITgcm_multiplier=1; % used to reduce run time for MItgcm
27
28 % bedrock/bathymetry
29 hmax=1000;
30@@ -845,8 +845,7 @@
31 loaddata(org,'ParameterizeIce');
32 loaddata(org,'Bathymetry');
33 loaddata(org,'IceSheetGeometry');
34- endtime = round(MITgcmDeltaT * ...
35- floor(time_step*y2s*async_step_MITgcm_multiplier/MITgcmDeltaT));
36+ endtime = round(MITgcmDeltaT * floor(final_time*y2s/MITgcmDeltaT));
37
38 % {{{ prepare MITgcm
39 % rename previous run directory and create new one
40@@ -987,7 +986,9 @@
41
42 md.transient.isoceancoupling=1;
43 md.transient.isgroundingline=1;
44- md.timestepping.coupling_time=1/12;
45+ md.timestepping.coupling_time=time_step;
46+ md.timestepping.time_step=time_step;
47+ md.timestepping.final_time=final_time;
48 md.cluster.npocean=nPx*nPy;
49 md.cluster.executionpath=[pwd '/run'];
50 md.masstransport.requested_outputs={'default','BasalforcingsFloatingiceMeltingRate'};
Note: See TracBrowser for help on using the repository browser.