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

  • ../trunk-jpl/lib

  • ../trunk-jpl/test/MITgcm/build 

    Property changes on: ../trunk-jpl/lib
___________________________________________________________________
Modified: svn:ignore
## -3,3 +3,4 ##
 *.mexa64
 *.mexmaci64
 *.so
+*.dylib

  • ../trunk-jpl/test/NightlyRun 

    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*

  • ../trunk-jpl/externalpackages 

    Property changes on: ../trunk-jpl/test/NightlyRun
___________________________________________________________________
Modified: svn:ignore
## -13,3 +13,7 ##
 *.outbin
 qmu*
 *.bin
+Models
+run
+run.old
+run_matlab

  • ../trunk-jpl/src/c/classes/Dakota 

    Property changes on: ../trunk-jpl/externalpackages
___________________________________________________________________
Modified: svn:ignore
## -17,3 +17,5 ##
 CMakeCache.txt
 Makefile
 CMakeFiles
+matlab
+svn-commit.tmp

  • ../trunk-jpl/src/c/shared/io/Marshalling 

    Property changes on: ../trunk-jpl/src/c/classes/Dakota
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+.deps

  • ../trunk-jpl/src/c/modules/GeothermalFluxx 

    Property changes on: ../trunk-jpl/src/c/shared/io/Marshalling
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+.deps
+.dirstamp

  • ../trunk-jpl/src/c/modules/GiaDeflectionCorex 

    Property changes on: ../trunk-jpl/src/c/modules/GeothermalFluxx
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+.deps
+.dirstamp

  • ../trunk-jpl/src/c/modules/FourierLoveCorex 

    Property changes on: ../trunk-jpl/src/c/modules/GiaDeflectionCorex
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+.deps
+.dirstamp

  • ../trunk-jpl/src/c/modules/DistanceToMaskBoundaryx 

    Property changes on: ../trunk-jpl/src/c/modules/FourierLoveCorex
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+.deps
+.dirstamp

  • ../trunk-jpl/src/c/modules 

    Property changes on: ../trunk-jpl/src/c/modules/DistanceToMaskBoundaryx
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+.deps
+.dirstamp

  • ../trunk-jpl/src/wrappers/javascript/io 

    Property changes on: ../trunk-jpl/src/c/modules
___________________________________________________________________
Modified: svn:ignore
## -1 +1,4 ##
 .deps
+InputControlUpdatex
+InputScalex
+TriaSearchx

  • ../trunk-jpl/src/wrappers/Issm 

    Property changes on: ../trunk-jpl/src/wrappers/javascript/io
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+.deps

  • ../trunk-jpl/src/wrappers/DistanceToMaskBoundary 

    Property changes on: ../trunk-jpl/src/wrappers/Issm
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+.deps

  • ../trunk-jpl/src/wrappers 

    Property changes on: ../trunk-jpl/src/wrappers/DistanceToMaskBoundary
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+.deps
+.dirstamp

  • ../trunk-jpl/test/MITgcm/coupling_rules.txt 

    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
     
    11Rules for coupling ISSM and MITgcm:
    22
    33*
     4
     5>>>> INITIALIZATION FROM SCRATCH
     6
     7CouplingTime=0
     81. ISSM sends CouplingTime=0 bed to MITgcm
     92. MITgcm integrates for CouplingTime=0:1
     10
     11CouplingTime=1
     121. MITgcm sends time-mean melt rate for CouplingTime=0:1 to ISSM
     132. ISSM sends CouplingTime=0 bed to MITgcm (it's duplicate of above)
     143. ISSM integrates for CouplingTime=0:1
     154. MITgcm integrates for CouplingTime=1:2
     16
     17CouplingTime=2
     181. MITgcm sends time-mean melt rate for CouplingTime=1:2 to ISSM
     192. ISSM sends CouplingTime=1 bed to MITgcm
     203. ISSM integrates for CouplingTime=1:2
     214. MITgcm integrates for CouplingTime=2:3
     22
     23...
     24
     25CouplingTime=N-1
     261. MITgcm sends time-mean melt rate for CouplingTime=(N-2):(N-1) to ISSM
     272. ISSM sends CouplingTime=N-2 bed to MITgcm
     283. ISSM integrates for CouplingTime=(N-2):(N-1)
     294. MITgcm integrates for CouplingTime=(N-1):N
     30
     31CouplingTime=N (restart files are saved here)
     321. MITgcm sends time-mean melt rate for CouplingTime=(N-1):N to ISSM
     332. MITgcm saves CouplingTime=N MITgcm state
     343. ISSM saves CouplingTime=N-1 ISSM state and CouplingTime=(N-1):N melt rate
     35
     36
     37>>>> RESTART FROM SAVED STATE
     38
     39CouplingTime=N
     401. ISSM sends CouplingTime=N-1 bed to MITgcm
     412. ISSM integrates for CouplingTime=(N-1):N
     423. MITgcm integrates for CouplingTime=N:(N+1)
     43
     44CouplingTime=N+1
     451. MITgcm sends time-mean melt rate for CouplingTime=N:(N+1) to ISSM
     462. ISSM sends CouplingTime=N bed to MITgcm
     473. ISSM integrates for CouplingTime=N:(N+1)
     484. MITgcm integrates for CouplingTime=(N+1):(N+2)
     49
     50...

  • ../trunk-jpl/test/MITgcm

  • ../trunk-jpl/src/c/main/issm_ocean.cpp 

    Property changes on: ../trunk-jpl/test/MITgcm
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+install
     
    3434
    3535        /*Split world into sub-communicators for each and every model:*/
    3636        ISSM_MPI_Comm_split(worldcomm,0, my_rank, &modelcomm);
    37 
    3837        ISSM_MPI_Comm_rank(modelcomm,&my_local_rank);
    3938        ISSM_MPI_Comm_size(modelcomm,&my_local_size);
    4039

  • ../trunk-jpl/src/c/main

  • ../trunk-jpl/src/c 

    Property changes on: ../trunk-jpl/src/c/main
___________________________________________________________________
Modified: svn:ignore
## -1,2 +1,4 ##
 .deps
 .dirstamp
+issm_ocean.cpp_orig
+model.mod
Note: See TracBrowser for help on using the repository browser.