Changeset 23083

Timestamp:

08/08/18 12:16:12 (7 years ago)

Author:

dmenemen

Message:

switching MITgcm installation to github
and updating to latest MITgcm version
Archive4002.arch remains unchanged!

Location:

issm/trunk-jpl/test

Files:

• MITgcm/code/CPP_EEOPTIONS.h (modified) (1 diff)
• MITgcm/code/EESUPPORT.h (deleted)
• MITgcm/code/SIZE.h.bak (modified) (3 diffs)
• MITgcm/code/do_oceanic_phys.F (modified) (1 diff)
• MITgcm/code/eeboot_minimal.F (modified) (1 diff)
• MITgcm/code/eedie.F (modified) (1 diff)
• MITgcm/get_mitgcm.sh (modified) (1 diff)
• MITgcm/install.sh (modified) (1 diff)
• NightlyRun/test4002.m (modified) (1 diff)

issm/trunk-jpl/test/MITgcm/code/CPP_EEOPTIONS.h

@@ -1 @@
-C $Header: /u/gcmpack/MITgcm/eesupp/inc/CPP_EEOPTIONS.h,v 1.43 2017/09/14 19:47:35 jmc Exp $
-C $Name:  $
-
 CBOP
 C     !ROUTINE: CPP_EEOPTIONS.h

issm/trunk-jpl/test/MITgcm/code/SIZE.h.bak

@@ -1 @@
-C $Header: /u/gcmpack/MITgcm/model/inc/SIZE.h,v 1.28 2009/05/17 21:15:07 jmc Exp $
-C $Name:  $
-C
 CBOP
 C    !ROUTINE: SIZE.h
@@ -8 +5 @@
 C    !DESCRIPTION: \bv
 C     *==========================================================*
-C     | SIZE.h Declare size of underlying computational grid.     
+C     | SIZE.h Declare size of underlying computational grid.
 C     *==========================================================*
-C     | The design here support a three-dimensional model grid    
-C     | with indices I,J and K. The three-dimensional domain      
-C     | is comprised of nPx*nSx blocks of size sNx along one axis 
-C     | nPy*nSy blocks of size sNy along another axis and one     
-C     | block of size Nz along the final axis.                    
-C     | Blocks have overlap regions of size OLx and OLy along the 
-C     | dimensions that are subdivided.                           
+C     | The design here supports a three-dimensional model grid
+C     | with indices I,J and K. The three-dimensional domain
+C     | is comprised of nPx*nSx blocks (or tiles) of size sNx
+C     | along the first (left-most index) axis, nPy*nSy blocks
+C     | of size sNy along the second axis and one block of size
+C     | Nr along the vertical (third) axis.
+C     | Blocks/tiles have overlap regions of size OLx and OLy
+C     | along the dimensions that are subdivided.
 C     *==========================================================*
 C     \ev
+C
+C     Voodoo numbers controlling data layout:
+C     sNx :: Number of X points in tile.
+C     sNy :: Number of Y points in tile.
+C     OLx :: Tile overlap extent in X.
+C     OLy :: Tile overlap extent in Y.
+C     nSx :: Number of tiles per process in X.
+C     nSy :: Number of tiles per process in Y.
+C     nPx :: Number of processes to use in X.
+C     nPy :: Number of processes to use in Y.
+C     Nx  :: Number of points in X for the full domain.
+C     Ny  :: Number of points in Y for the full domain.
+C     Nr  :: Number of points in vertical direction.
 CEOP
-C     Voodoo numbers controlling data layout.
-C     sNx :: No. X points in sub-grid.
-C     sNy :: No. Y points in sub-grid.
-C     OLx :: Overlap extent in X.
-C     OLy :: Overlat extent in Y.
-C     nSx :: No. sub-grids in X.
-C     nSy :: No. sub-grids in Y.
-C     nPx :: No. of processes to use in X.
-C     nPy :: No. of processes to use in Y.
-C     Nx  :: No. points in X for the total domain.
-C     Ny  :: No. points in Y for the total domain.
-C     Nr  :: No. points in Z for full process domain.
       INTEGER sNx
       INTEGER sNy
@@ -63 +62 @@
       PARAMETER ( MAX_OLX = OLx,
      &            MAX_OLY = OLy )
+

issm/trunk-jpl/test/MITgcm/code/do_oceanic_phys.F

@@ -1 @@
-C $Header: /u/gcmpack/MITgcm/model/src/do_oceanic_phys.F,v 1.149 2017/02/12 20:18:24 gforget Exp $
-C $Name:  $
-
 #include "PACKAGES_CONFIG.h"
 #include "CPP_OPTIONS.h"

issm/trunk-jpl/test/MITgcm/code/eeboot_minimal.F

@@ -1 @@
-C $Header: /u/gcmpack/MITgcm/eesupp/src/eeboot_minimal.F,v 1.31 2017/07/26 21:23:07 jmc Exp $
-C $Name:  $
-
 #include "PACKAGES_CONFIG.h"
 #include "CPP_EEOPTIONS.h"

issm/trunk-jpl/test/MITgcm/code/eedie.F

@@ -1 @@
-C $Header: /u/gcmpack/MITgcm/eesupp/src/eedie.F,v 1.13 2012/10/11 19:15:18 jmc Exp $
-C $Name:  $
-
 #include "CPP_EEOPTIONS.h"
 #ifdef USE_LIBHPM

issm/trunk-jpl/test/MITgcm/get_mitgcm.sh

@@ -9 +9 @@
 if [ ! -d install ]; then
     source install.sh
+else
+    cd install
+    git pull
+    cd ..
 fi

issm/trunk-jpl/test/MITgcm/install.sh

@@ -4 +4 @@
 rm -rf install
 
-#Add cvs repository
-export CVSROOT=':pserver:cvsanon@mitgcm.org:/u/gcmpack'
-
 #Download code from server
-echo loging into MITgcm CVS server
-echo enter MITgcm CVS password: cvsanon
-#Login only the first time
-#cvs login
-cvs co -P MITgcm_code
+git clone --depth=1 https://github.com/MITgcm/MITgcm.git
 
 #Move

issm/trunk-jpl/test/NightlyRun/test4002.m

@@ -6 +6 @@
 final_time=1/365;
 
+%To download and recompile MITgcm from scratch:
+% rm -rf $ISSM_DIR/test/MITgcm/install
+% rm -rf $ISSM_DIR/test/MITgcm/build
+% rm $ISSM_DIR/test/MITgcm/code/SIZE.h
+
 %Organizer
 mkdir Models
 org=organizer('repository','Models/','prefix','IceOcean.','steps',steps);
 
-presentdirectory=pwd; 
+presentdirectory=pwd;
 
 % {{{ Parameters: