source: issm/oecreview/Archive/21724-22754/ISSM-22441-22442.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: 9.6 KB
RevLine 
[22755]1Index: ../trunk-jpl/lib
2===================================================================
3--- ../trunk-jpl/lib (revision 22441)
4+++ ../trunk-jpl/lib (revision 22442)
5
6Property changes on: ../trunk-jpl/lib
7___________________________________________________________________
8Modified: svn:ignore
9## -3,3 +3,4 ##
10 *.mexa64
11 *.mexmaci64
12 *.so
13+*.dylib
14Index: ../trunk-jpl/test/MITgcm/build
15===================================================================
16--- ../trunk-jpl/test/MITgcm/build (revision 22441)
17+++ ../trunk-jpl/test/MITgcm/build (revision 22442)
18
19Property changes on: ../trunk-jpl/test/MITgcm/build
20___________________________________________________________________
21Added: svn:ignore
22## -0,0 +1,8 ##
23+mitgcmuv
24+*.c
25+*.F
26+*.for
27+*.h
28+f90mkdepend.log
29+genmake.log
30+Makefile*
31Index: ../trunk-jpl/test/NightlyRun
32===================================================================
33--- ../trunk-jpl/test/NightlyRun (revision 22441)
34+++ ../trunk-jpl/test/NightlyRun (revision 22442)
35
36Property changes on: ../trunk-jpl/test/NightlyRun
37___________________________________________________________________
38Modified: svn:ignore
39## -13,3 +13,7 ##
40 *.outbin
41 qmu*
42 *.bin
43+Models
44+run
45+run.old
46+run_matlab
47Index: ../trunk-jpl/externalpackages
48===================================================================
49--- ../trunk-jpl/externalpackages (revision 22441)
50+++ ../trunk-jpl/externalpackages (revision 22442)
51
52Property changes on: ../trunk-jpl/externalpackages
53___________________________________________________________________
54Modified: svn:ignore
55## -17,3 +17,5 ##
56 CMakeCache.txt
57 Makefile
58 CMakeFiles
59+matlab
60+svn-commit.tmp
61Index: ../trunk-jpl/src/c/classes/Dakota
62===================================================================
63--- ../trunk-jpl/src/c/classes/Dakota (revision 22441)
64+++ ../trunk-jpl/src/c/classes/Dakota (revision 22442)
65
66Property changes on: ../trunk-jpl/src/c/classes/Dakota
67___________________________________________________________________
68Added: svn:ignore
69## -0,0 +1 ##
70+.deps
71Index: ../trunk-jpl/src/c/shared/io/Marshalling
72===================================================================
73--- ../trunk-jpl/src/c/shared/io/Marshalling (revision 22441)
74+++ ../trunk-jpl/src/c/shared/io/Marshalling (revision 22442)
75
76Property changes on: ../trunk-jpl/src/c/shared/io/Marshalling
77___________________________________________________________________
78Added: svn:ignore
79## -0,0 +1,2 ##
80+.deps
81+.dirstamp
82Index: ../trunk-jpl/src/c/modules/GeothermalFluxx
83===================================================================
84--- ../trunk-jpl/src/c/modules/GeothermalFluxx (revision 22441)
85+++ ../trunk-jpl/src/c/modules/GeothermalFluxx (revision 22442)
86
87Property changes on: ../trunk-jpl/src/c/modules/GeothermalFluxx
88___________________________________________________________________
89Added: svn:ignore
90## -0,0 +1,2 ##
91+.deps
92+.dirstamp
93Index: ../trunk-jpl/src/c/modules/GiaDeflectionCorex
94===================================================================
95--- ../trunk-jpl/src/c/modules/GiaDeflectionCorex (revision 22441)
96+++ ../trunk-jpl/src/c/modules/GiaDeflectionCorex (revision 22442)
97
98Property changes on: ../trunk-jpl/src/c/modules/GiaDeflectionCorex
99___________________________________________________________________
100Added: svn:ignore
101## -0,0 +1,2 ##
102+.deps
103+.dirstamp
104Index: ../trunk-jpl/src/c/modules/FourierLoveCorex
105===================================================================
106--- ../trunk-jpl/src/c/modules/FourierLoveCorex (revision 22441)
107+++ ../trunk-jpl/src/c/modules/FourierLoveCorex (revision 22442)
108
109Property changes on: ../trunk-jpl/src/c/modules/FourierLoveCorex
110___________________________________________________________________
111Added: svn:ignore
112## -0,0 +1,2 ##
113+.deps
114+.dirstamp
115Index: ../trunk-jpl/src/c/modules/DistanceToMaskBoundaryx
116===================================================================
117--- ../trunk-jpl/src/c/modules/DistanceToMaskBoundaryx (revision 22441)
118+++ ../trunk-jpl/src/c/modules/DistanceToMaskBoundaryx (revision 22442)
119
120Property changes on: ../trunk-jpl/src/c/modules/DistanceToMaskBoundaryx
121___________________________________________________________________
122Added: svn:ignore
123## -0,0 +1,2 ##
124+.deps
125+.dirstamp
126Index: ../trunk-jpl/src/c/modules
127===================================================================
128--- ../trunk-jpl/src/c/modules (revision 22441)
129+++ ../trunk-jpl/src/c/modules (revision 22442)
130
131Property changes on: ../trunk-jpl/src/c/modules
132___________________________________________________________________
133Modified: svn:ignore
134## -1 +1,4 ##
135 .deps
136+InputControlUpdatex
137+InputScalex
138+TriaSearchx
139Index: ../trunk-jpl/src/wrappers/javascript/io
140===================================================================
141--- ../trunk-jpl/src/wrappers/javascript/io (revision 22441)
142+++ ../trunk-jpl/src/wrappers/javascript/io (revision 22442)
143
144Property changes on: ../trunk-jpl/src/wrappers/javascript/io
145___________________________________________________________________
146Added: svn:ignore
147## -0,0 +1 ##
148+.deps
149Index: ../trunk-jpl/src/wrappers/Issm
150===================================================================
151--- ../trunk-jpl/src/wrappers/Issm (revision 22441)
152+++ ../trunk-jpl/src/wrappers/Issm (revision 22442)
153
154Property changes on: ../trunk-jpl/src/wrappers/Issm
155___________________________________________________________________
156Added: svn:ignore
157## -0,0 +1 ##
158+.deps
159Index: ../trunk-jpl/src/wrappers/DistanceToMaskBoundary
160===================================================================
161--- ../trunk-jpl/src/wrappers/DistanceToMaskBoundary (revision 22441)
162+++ ../trunk-jpl/src/wrappers/DistanceToMaskBoundary (revision 22442)
163
164Property changes on: ../trunk-jpl/src/wrappers/DistanceToMaskBoundary
165___________________________________________________________________
166Added: svn:ignore
167## -0,0 +1,2 ##
168+.deps
169+.dirstamp
170Index: ../trunk-jpl/src/wrappers
171===================================================================
172--- ../trunk-jpl/src/wrappers (revision 22441)
173+++ ../trunk-jpl/src/wrappers (revision 22442)
174
175Property changes on: ../trunk-jpl/src/wrappers
176___________________________________________________________________
177Modified: svn:ignore
178## -16,3 +16,15 ##
179 *.mexw32.map
180 *.exe.manifest
181 .dirstamp
182+EnumToString
183+Exp2Kml
184+Issm/.deps
185+KMLFileRead
186+KMLMeshWrite
187+KMLOverlay
188+Kml2Exp
189+Ll2xy
190+Shp2Kml
191+StringToEnum
192+TriaSearch
193+Xy2ll
194Index: ../trunk-jpl/test/MITgcm/coupling_rules.txt
195===================================================================
196--- ../trunk-jpl/test/MITgcm/coupling_rules.txt (revision 22441)
197+++ ../trunk-jpl/test/MITgcm/coupling_rules.txt (revision 22442)
198@@ -1,3 +1,50 @@
199 Rules for coupling ISSM and MITgcm:
200
201 *
202+
203+>>>> INITIALIZATION FROM SCRATCH
204+
205+CouplingTime=0
206+1. ISSM sends CouplingTime=0 bed to MITgcm
207+2. MITgcm integrates for CouplingTime=0:1
208+
209+CouplingTime=1
210+1. MITgcm sends time-mean melt rate for CouplingTime=0:1 to ISSM
211+2. ISSM sends CouplingTime=0 bed to MITgcm (it's duplicate of above)
212+3. ISSM integrates for CouplingTime=0:1
213+4. MITgcm integrates for CouplingTime=1:2
214+
215+CouplingTime=2
216+1. MITgcm sends time-mean melt rate for CouplingTime=1:2 to ISSM
217+2. ISSM sends CouplingTime=1 bed to MITgcm
218+3. ISSM integrates for CouplingTime=1:2
219+4. MITgcm integrates for CouplingTime=2:3
220+
221+...
222+
223+CouplingTime=N-1
224+1. MITgcm sends time-mean melt rate for CouplingTime=(N-2):(N-1) to ISSM
225+2. ISSM sends CouplingTime=N-2 bed to MITgcm
226+3. ISSM integrates for CouplingTime=(N-2):(N-1)
227+4. MITgcm integrates for CouplingTime=(N-1):N
228+
229+CouplingTime=N (restart files are saved here)
230+1. MITgcm sends time-mean melt rate for CouplingTime=(N-1):N to ISSM
231+2. MITgcm saves CouplingTime=N MITgcm state
232+3. ISSM saves CouplingTime=N-1 ISSM state and CouplingTime=(N-1):N melt rate
233+
234+
235+>>>> RESTART FROM SAVED STATE
236+
237+CouplingTime=N
238+1. ISSM sends CouplingTime=N-1 bed to MITgcm
239+2. ISSM integrates for CouplingTime=(N-1):N
240+3. MITgcm integrates for CouplingTime=N:(N+1)
241+
242+CouplingTime=N+1
243+1. MITgcm sends time-mean melt rate for CouplingTime=N:(N+1) to ISSM
244+2. ISSM sends CouplingTime=N bed to MITgcm
245+3. ISSM integrates for CouplingTime=N:(N+1)
246+4. MITgcm integrates for CouplingTime=(N+1):(N+2)
247+
248+...
249Index: ../trunk-jpl/test/MITgcm
250===================================================================
251--- ../trunk-jpl/test/MITgcm (revision 22441)
252+++ ../trunk-jpl/test/MITgcm (revision 22442)
253
254Property changes on: ../trunk-jpl/test/MITgcm
255___________________________________________________________________
256Added: svn:ignore
257## -0,0 +1 ##
258+install
259Index: ../trunk-jpl/src/c/main/issm_ocean.cpp
260===================================================================
261--- ../trunk-jpl/src/c/main/issm_ocean.cpp (revision 22441)
262+++ ../trunk-jpl/src/c/main/issm_ocean.cpp (revision 22442)
263@@ -34,7 +34,6 @@
264
265 /*Split world into sub-communicators for each and every model:*/
266 ISSM_MPI_Comm_split(worldcomm,0, my_rank, &modelcomm);
267-
268 ISSM_MPI_Comm_rank(modelcomm,&my_local_rank);
269 ISSM_MPI_Comm_size(modelcomm,&my_local_size);
270
271Index: ../trunk-jpl/src/c/main
272===================================================================
273--- ../trunk-jpl/src/c/main (revision 22441)
274+++ ../trunk-jpl/src/c/main (revision 22442)
275
276Property changes on: ../trunk-jpl/src/c/main
277___________________________________________________________________
278Modified: svn:ignore
279## -1,2 +1,4 ##
280 .deps
281 .dirstamp
282+issm_ocean.cpp_orig
283+model.mod
284Index: ../trunk-jpl/src/c
285===================================================================
286--- ../trunk-jpl/src/c (revision 22441)
287+++ ../trunk-jpl/src/c (revision 22442)
288
289Property changes on: ../trunk-jpl/src/c
290___________________________________________________________________
291Modified: svn:ignore
292## -19,3 +19,8 ##
293 issm
294 kriging
295 issm_slr
296+issm_ocean
297+lnb_param.mod
298+lovenb_sub.mod
299+model.mod
300+util.mod
Note: See TracBrowser for help on using the repository browser.