Index: ../trunk-jpl/lib
===================================================================
--- ../trunk-jpl/lib	(revision 22441)
+++ ../trunk-jpl/lib	(revision 22442)

Property changes on: ../trunk-jpl/lib
___________________________________________________________________
Modified: svn:ignore
## -3,3 +3,4 ##
 *.mexa64
 *.mexmaci64
 *.so
+*.dylib
Index: ../trunk-jpl/test/MITgcm/build
===================================================================
--- ../trunk-jpl/test/MITgcm/build	(revision 22441)
+++ ../trunk-jpl/test/MITgcm/build	(revision 22442)

Property changes on: ../trunk-jpl/test/MITgcm/build
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,8 ##
+mitgcmuv
+*.c
+*.F
+*.for
+*.h
+f90mkdepend.log
+genmake.log
+Makefile*
Index: ../trunk-jpl/test/NightlyRun
===================================================================
--- ../trunk-jpl/test/NightlyRun	(revision 22441)
+++ ../trunk-jpl/test/NightlyRun	(revision 22442)

Property changes on: ../trunk-jpl/test/NightlyRun
___________________________________________________________________
Modified: svn:ignore
## -13,3 +13,7 ##
 *.outbin
 qmu*
 *.bin
+Models
+run
+run.old
+run_matlab
Index: ../trunk-jpl/externalpackages
===================================================================
--- ../trunk-jpl/externalpackages	(revision 22441)
+++ ../trunk-jpl/externalpackages	(revision 22442)

Property changes on: ../trunk-jpl/externalpackages
___________________________________________________________________
Modified: svn:ignore
## -17,3 +17,5 ##
 CMakeCache.txt
 Makefile
 CMakeFiles
+matlab
+svn-commit.tmp
Index: ../trunk-jpl/src/c/classes/Dakota
===================================================================
--- ../trunk-jpl/src/c/classes/Dakota	(revision 22441)
+++ ../trunk-jpl/src/c/classes/Dakota	(revision 22442)

Property changes on: ../trunk-jpl/src/c/classes/Dakota
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+.deps
Index: ../trunk-jpl/src/c/shared/io/Marshalling
===================================================================
--- ../trunk-jpl/src/c/shared/io/Marshalling	(revision 22441)
+++ ../trunk-jpl/src/c/shared/io/Marshalling	(revision 22442)

Property changes on: ../trunk-jpl/src/c/shared/io/Marshalling
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+.deps
+.dirstamp
Index: ../trunk-jpl/src/c/modules/GeothermalFluxx
===================================================================
--- ../trunk-jpl/src/c/modules/GeothermalFluxx	(revision 22441)
+++ ../trunk-jpl/src/c/modules/GeothermalFluxx	(revision 22442)

Property changes on: ../trunk-jpl/src/c/modules/GeothermalFluxx
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+.deps
+.dirstamp
Index: ../trunk-jpl/src/c/modules/GiaDeflectionCorex
===================================================================
--- ../trunk-jpl/src/c/modules/GiaDeflectionCorex	(revision 22441)
+++ ../trunk-jpl/src/c/modules/GiaDeflectionCorex	(revision 22442)

Property changes on: ../trunk-jpl/src/c/modules/GiaDeflectionCorex
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+.deps
+.dirstamp
Index: ../trunk-jpl/src/c/modules/FourierLoveCorex
===================================================================
--- ../trunk-jpl/src/c/modules/FourierLoveCorex	(revision 22441)
+++ ../trunk-jpl/src/c/modules/FourierLoveCorex	(revision 22442)

Property changes on: ../trunk-jpl/src/c/modules/FourierLoveCorex
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+.deps
+.dirstamp
Index: ../trunk-jpl/src/c/modules/DistanceToMaskBoundaryx
===================================================================
--- ../trunk-jpl/src/c/modules/DistanceToMaskBoundaryx	(revision 22441)
+++ ../trunk-jpl/src/c/modules/DistanceToMaskBoundaryx	(revision 22442)

Property changes on: ../trunk-jpl/src/c/modules/DistanceToMaskBoundaryx
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+.deps
+.dirstamp
Index: ../trunk-jpl/src/c/modules
===================================================================
--- ../trunk-jpl/src/c/modules	(revision 22441)
+++ ../trunk-jpl/src/c/modules	(revision 22442)

Property changes on: ../trunk-jpl/src/c/modules
___________________________________________________________________
Modified: svn:ignore
## -1 +1,4 ##
 .deps
+InputControlUpdatex
+InputScalex
+TriaSearchx
Index: ../trunk-jpl/src/wrappers/javascript/io
===================================================================
--- ../trunk-jpl/src/wrappers/javascript/io	(revision 22441)
+++ ../trunk-jpl/src/wrappers/javascript/io	(revision 22442)

Property changes on: ../trunk-jpl/src/wrappers/javascript/io
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+.deps
Index: ../trunk-jpl/src/wrappers/Issm
===================================================================
--- ../trunk-jpl/src/wrappers/Issm	(revision 22441)
+++ ../trunk-jpl/src/wrappers/Issm	(revision 22442)

Property changes on: ../trunk-jpl/src/wrappers/Issm
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+.deps
Index: ../trunk-jpl/src/wrappers/DistanceToMaskBoundary
===================================================================
--- ../trunk-jpl/src/wrappers/DistanceToMaskBoundary	(revision 22441)
+++ ../trunk-jpl/src/wrappers/DistanceToMaskBoundary	(revision 22442)

Property changes on: ../trunk-jpl/src/wrappers/DistanceToMaskBoundary
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+.deps
+.dirstamp
Index: ../trunk-jpl/src/wrappers
===================================================================
--- ../trunk-jpl/src/wrappers	(revision 22441)
+++ ../trunk-jpl/src/wrappers	(revision 22442)

Property changes on: ../trunk-jpl/src/wrappers
___________________________________________________________________
Modified: svn:ignore
## -16,3 +16,15 ##
 *.mexw32.map
 *.exe.manifest
 .dirstamp
+EnumToString
+Exp2Kml
+Issm/.deps
+KMLFileRead
+KMLMeshWrite
+KMLOverlay
+Kml2Exp
+Ll2xy
+Shp2Kml
+StringToEnum
+TriaSearch
+Xy2ll
Index: ../trunk-jpl/test/MITgcm/coupling_rules.txt
===================================================================
--- ../trunk-jpl/test/MITgcm/coupling_rules.txt	(revision 22441)
+++ ../trunk-jpl/test/MITgcm/coupling_rules.txt	(revision 22442)
@@ -1,3 +1,50 @@
 Rules for coupling ISSM and MITgcm:
 
 * 
+
+>>>> INITIALIZATION FROM SCRATCH
+
+CouplingTime=0
+1. ISSM sends CouplingTime=0 bed to MITgcm
+2. MITgcm integrates for CouplingTime=0:1
+
+CouplingTime=1
+1. MITgcm sends time-mean melt rate for CouplingTime=0:1 to ISSM
+2. ISSM sends CouplingTime=0 bed to MITgcm (it's duplicate of above)
+3. ISSM integrates for CouplingTime=0:1
+4. MITgcm integrates for CouplingTime=1:2
+
+CouplingTime=2
+1. MITgcm sends time-mean melt rate for CouplingTime=1:2 to ISSM
+2. ISSM sends CouplingTime=1 bed to MITgcm
+3. ISSM integrates for CouplingTime=1:2
+4. MITgcm integrates for CouplingTime=2:3
+
+...
+
+CouplingTime=N-1
+1. MITgcm sends time-mean melt rate for CouplingTime=(N-2):(N-1) to ISSM
+2. ISSM sends CouplingTime=N-2 bed to MITgcm
+3. ISSM integrates for CouplingTime=(N-2):(N-1)
+4. MITgcm integrates for CouplingTime=(N-1):N
+
+CouplingTime=N (restart files are saved here)
+1. MITgcm sends time-mean melt rate for CouplingTime=(N-1):N to ISSM
+2. MITgcm saves CouplingTime=N MITgcm state
+3. ISSM saves CouplingTime=N-1 ISSM state and CouplingTime=(N-1):N melt rate
+
+
+>>>> RESTART FROM SAVED STATE
+
+CouplingTime=N
+1. ISSM sends CouplingTime=N-1 bed to MITgcm
+2. ISSM integrates for CouplingTime=(N-1):N
+3. MITgcm integrates for CouplingTime=N:(N+1)
+
+CouplingTime=N+1
+1. MITgcm sends time-mean melt rate for CouplingTime=N:(N+1) to ISSM
+2. ISSM sends CouplingTime=N bed to MITgcm
+3. ISSM integrates for CouplingTime=N:(N+1)
+4. MITgcm integrates for CouplingTime=(N+1):(N+2)
+
+...
Index: ../trunk-jpl/test/MITgcm
===================================================================
--- ../trunk-jpl/test/MITgcm	(revision 22441)
+++ ../trunk-jpl/test/MITgcm	(revision 22442)

Property changes on: ../trunk-jpl/test/MITgcm
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+install
Index: ../trunk-jpl/src/c/main/issm_ocean.cpp
===================================================================
--- ../trunk-jpl/src/c/main/issm_ocean.cpp	(revision 22441)
+++ ../trunk-jpl/src/c/main/issm_ocean.cpp	(revision 22442)
@@ -34,7 +34,6 @@
 
 	/*Split world into sub-communicators for each and every model:*/
 	ISSM_MPI_Comm_split(worldcomm,0, my_rank, &modelcomm);
-
 	ISSM_MPI_Comm_rank(modelcomm,&my_local_rank);
 	ISSM_MPI_Comm_size(modelcomm,&my_local_size);
 
Index: ../trunk-jpl/src/c/main
===================================================================
--- ../trunk-jpl/src/c/main	(revision 22441)
+++ ../trunk-jpl/src/c/main	(revision 22442)

Property changes on: ../trunk-jpl/src/c/main
___________________________________________________________________
Modified: svn:ignore
## -1,2 +1,4 ##
 .deps
 .dirstamp
+issm_ocean.cpp_orig
+model.mod
Index: ../trunk-jpl/src/c
===================================================================
--- ../trunk-jpl/src/c	(revision 22441)
+++ ../trunk-jpl/src/c	(revision 22442)

Property changes on: ../trunk-jpl/src/c
___________________________________________________________________
Modified: svn:ignore
## -19,3 +19,8 ##
 issm
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod