Merge pull request #130 from nicjhan/run-on-aws

Changes need to get ubuntu machine running on AWS #129
mom-ocean · Oct 29, 2015 · c3a5fef · c3a5fef
2 parents 87657a3 + f58453f
commit c3a5fef
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/bin/environs.ubuntu b/bin/environs.ubuntu
@@ -0,0 +1 @@
+         setenv mpirunCommand   "mpirun -np"
diff --git a/exp/MOM_compile.csh b/exp/MOM_compile.csh
@@ -87,9 +87,9 @@ source $root/bin/environs.$platform  # environment variables and loadable module
 
 #
 # compile mppnccombine.c, needed only if $npes > 1
-  if ( ! -f $mppnccombine ) then
-    cc -O -o $mppnccombine -I/usr/local/include -L/usr/local/lib $code_dir/postprocessing/mppnccombine/mppnccombine.c -lnetcdf
-  endif
+if ( ! -f $mppnccombine ) then
+    cc -O -o $mppnccombine -I/usr/local/include -L/usr/local/lib $code_dir/postprocessing/mppnccombine/mppnccombine.c -lm -lnetcdf
+endif
 
 set mkmf_lib = "$mkmf -f -m Makefile -a $code_dir -t $mkmfTemplate"
 set lib_include_dirs = "$root/include $code_dir/shared/include $code_dir/shared/mpp/include"

diff --git a/exp/MOM_run.csh b/exp/MOM_run.csh
@@ -124,7 +124,7 @@ if( $download ) then
     cd $root/data
     ./get_exp_data.py $name.input.tar.gz
     mkdir -p $workdir
-    cp $name.input.tar.gz $workdir
+    cp archives/$name.input.tar.gz $workdir
     cd $workdir
     tar zxvf $name.input.tar.gz
 endif