--- MITgcm_contrib/high_res_cube/README.cs32	2007/04/07 23:21:41	1.2
+++ MITgcm_contrib/high_res_cube/README.cs32	2011/02/11 03:58:52	1.10
@@ -5,23 +5,13 @@
 ##########################################################################
 # getting the code from anonymous CVS server
 
-  bash or sh shell:
-    $ export CVSROOT=':pserver:cvsanon@mitgcm.org:/u/gcmpack'
-    $ cvs login 
-      ( enter the CVS password: "cvsanon" )
-
-  tcsh or csh shell:
-    $ setenv CVSROOT ':pserver:cvsanon@mitgcm.org:/u/gcmpack'
-    $ cvs login 
-      ( enter the CVS password: "cvsanon" )
-
-cvs co MITgcm_contrib/high_res_cube/README.cs32
-cvs co MITgcm_contrib/high_res_cube/code-mods
-cvs co MITgcm_contrib/high_res_cube/input
-cvs co MITgcm_contrib/high_res_cube/results
-cvs co MITgcm_code
-cvs co MITgcm/verification/global_ocean.cs32x15
-cvs co MITgcm/verification/tutorial_held_suarez_cs/input
+cvs co -P MITgcm_contrib/high_res_cube/README.cs32
+cvs co -P MITgcm_contrib/high_res_cube/code-mods
+cvs co -P MITgcm_contrib/high_res_cube/input
+cvs co -P MITgcm_contrib/high_res_cube/results
+cvs co -P MITgcm_code
+cvs co -P MITgcm/verification/global_ocean.cs32x15/input
+cvs co -P MITgcm/verification/tutorial_held_suarez_cs/input
 
 ##########################################################################
 # 32*32*6*15, 1-cpu cube sphere
@@ -31,11 +21,10 @@
 cd build
 \rm *
 \cp ../../MITgcm_contrib/high_res_cube/code-mods/* .
-\cp ../utils/exch2/code-mods/s12t_16x32/* .
 \rm CPP_EEOPTIONS.h
 ../tools/genmake2
 make depend
-make -j
+make -j 16
 cd ../run
 \rm *
 \cp ../verification/tutorial_held_suarez_cs/input/grid* .
@@ -44,12 +33,10 @@
 \cp ../../MITgcm_contrib/high_res_cube/input/* .
 ../build/mitgcmuv >& output.txt
 
-comparison output is in:
-../../MITgcm_contrib/high_res_cube/results/output.txt
+emacs output.txt ../../MITgcm_contrib/high_res_cube/results/output.txt
 
-to use matlab to look at the output
+to use matlab to look at the output:
 matlab
-
 for fld={'SIuice','SIvice','SIheff','SIarea','oceQsw', ...
          'surForcT','oceTAUX','oceTAUY','surForcS'}
     tmp=permute(readbin([fld{1} '.0000000072.data'],[32,6,32]),[1 3 2]);
@@ -68,38 +55,92 @@
 
 
 ##########################################################################
-# 32*32*6*15, 17-tile, 1-cpu cube sphere experiment
-# needs fixing; does not work as of checkpoint58x_post
-# see discussion on MITgcm-devel
+# 32*32*6*15, 176-tile, 1-cpu cube sphere experiment
+# example that has 16 blank tiles
 
 cd ../build
 \rm *
 \cp ../../MITgcm_contrib/high_res_cube/code-mods/* .
-\cp ../verification/global_ocean.cs32x15/code_alt/code.176t_8x4/* .
+\cp ../utils/exch2/code-mods/s176t_8x4/SIZE.h .
+ex - SIZE.h >> /dev/null <<EOF
+/OLx =
+c
+     &           OLx =   5,
+.
+/OLy =
+c
+     &           OLy =   5,
+.
+w
+q
+EOF
 \rm CPP_EEOPTIONS.h
 ../tools/genmake2
 make depend
 make -j
+cd ..
+mv run run_orig
+mkdir run
+cd run
+\cp ../verification/tutorial_held_suarez_cs/input/grid* .
+\cp ../verification/global_ocean.cs32x15/input/lev_*_cs_15k.bin .
+\cp ../verification/global_ocean.cs32x15/input/bathy_Hmin50.bin .
+\cp ../utils/exch2/code-mods/data.exch2.16_blk data.exch2
+\cp ../../MITgcm_contrib/high_res_cube/input/* .
+../build/mitgcmuv >& output.txt
+
+to use matlab to compare to previous solution:
+matlab
+for f={'ETAN','oceTAUY','SIhsnow','surForcS','KPPhbl','PHIBOT', ...
+       'SIuice','surForcT','MXLDEPTH','SIarea','SIvice','UVEL_k1', ...
+       'oceQsw','SIheff','SSS','VVEL_k1','oceTAUX','SIhsalt','SST'}
+ t1=readbin(['../run_orig/' f{1} '.0000000072.data'],[32*6 32]);
+ t2=readbin([f{1} '.0000000072.data'],[32*6 32]);
+ clf, subplot(311), mypcolor(t1'); thincolorbar, title(f{1})
+ subplot(312), mypcolor(t2'); thincolorbar
+ subplot(313), mypcolor(t2'-t1'); thincolorbar, pause
+end
+for f={'YG','YC','XG','XC','RAZ','RAW','RAS','RAC','hFacW','hFacS', ...
+     'hFacC','Depth','DYG','DYC','DXG','DXC','AngleSN','AngleCS'}
+ t1=readbin(['../run_orig/' f{1} '.data'],[32*6 32]);
+ t2=readbin([f{1} '.data'],[32*6 32]);
+ clf, subplot(311), mypcolor(t1'); thincolorbar, title(f{1})
+ subplot(312), mypcolor(t2'); thincolorbar
+ subplot(313), mypcolor(t2'-t1'); thincolorbar, pause
+end
+
+
+##########################################################################
+# 32*32*6*15, 2-cpu cube sphere on the NAS altices with ifort
+
+cd MITgcm
+mkdir build run
+cd build
+\rm *
+\cp ../../MITgcm_contrib/high_res_cube/code-mods/* .
+\mv SIZE.h_mpi SIZE.h
+../tools/genmake2 -of ../../MITgcm_contrib/high_res_cube/code-mods/linux_ia64_ifort+mpi_altix_nas
+make depend
+make -j 8
 cd ../run
 \rm *
 \cp ../verification/tutorial_held_suarez_cs/input/grid* .
 \cp ../verification/global_ocean.cs32x15/input/lev_*_cs_15k.bin .
 \cp ../verification/global_ocean.cs32x15/input/bathy_Hmin50.bin .
 \cp ../../MITgcm_contrib/high_res_cube/input/* .
-../build/mitgcmuv >& output.txt
+mpirun -np 2 ../build/mitgcmuv
 
 
 ##########################################################################
-# 32*32*6*15, 2-cpu cube sphere on the altices with ifort
+# 32*32*6*15, 2-cpu cube sphere on the JPL altices with ifort
 
 cd MITgcm
 mkdir build run
 cd build
 \rm *
 \cp ../../MITgcm_contrib/high_res_cube/code-mods/* .
-\cp ../utils/exch2/code-mods/s12t_16x32/* .
-\cp SIZE.h_mpi SIZE.h
-../../../tools/genmake2 -mods=../code -of ../../../tools/build_options/linux_ia64_ifort+mpi_altix_nas
+\mv SIZE.h_mpi SIZE.h
+../tools/genmake2 -of ../tools/build_options/linux_ia64_ifort+mpi_altix_jpl
 make depend
 make -j
 cd ../run