Index: /issm/trunk-jpl/test/MITgcm/build_4003.sh =================================================================== --- /issm/trunk-jpl/test/MITgcm/build_4003.sh (revision 26613) +++ /issm/trunk-jpl/test/MITgcm/build_4003.sh (revision 26614) @@ -11,7 +11,7 @@ # Get MITgcm code, if needed -if [ ! -d "$modelpath/../MITgcm/install_dngoldberg" ]; then +if [ ! -d "$modelpath/../MITgcm/install" ]; then cd $modelpath/../MITgcm - source install_dngoldberg.sh + source install.sh cd $modelpath fi @@ -24,9 +24,16 @@ #create MITgcm makefile for this run, if needed if [ ! -f Makefile ]; then - if [ $hostname == "pleiades" ]; then - $modelpath/../MITgcm/install_dngoldberg/tools/genmake2 -of $SLR_DIR/models/ice-ocean/configs/linux_amd64_gfortran+mpi_ice_nas -mo ../code_4003 -rd $modelpath/../MITgcm/install_dngoldberg - else - $modelpath/../MITgcm/install_dngoldberg/tools/genmake2 -mpi -mo ../code_4003 -rd $modelpath/../MITgcm/install_dngoldberg - fi + case $hostname in + "pleiades") + $modelpath/../MITgcm/install/tools/genmake2 -of $SLR_DIR/models/ice-ocean/configs/linux_amd64_gfortran+mpi_ice_nas -mo ../code_4003 -rd $modelpath/../MITgcm/install + ;; + "babylon") + $modelpath/../MITgcm/install/tools/genmake2 -of $modelpath/../MITgcm/install/tools/build_options/linux_amd64_ifort -mpi -mo $modelpath/../MITgcm/code_4003 -rd $modelpath/../MITgcm/install + export LD_LIBRARY_PATH="$ISSM_DIR/externalpackages/petsc/install/lib:/dartfs-hpc/admin/opt/el7/intel/compilers_and_libraries_2019.3.199/linux/compiler/lib/intel64:$ISSM_DIR/externalpackages/triangle/install/lib" + ;; + *) + $modelpath/../MITgcm/install/tools/genmake2 -mpi -mo $modelpath/../MITgcm/code_4003 -rd $modelpath/../MITgcm/install + ;; + esac fi @@ -35,4 +42,3 @@ make depend fi - -make -j 4 +make -j 4 &> Makefile.log Index: sm/trunk-jpl/test/MITgcm/get_mitgcm_dngoldberg.sh =================================================================== --- /issm/trunk-jpl/test/MITgcm/get_mitgcm_dngoldberg.sh (revision 26613) +++ (revision ) @@ -1,15 +1,0 @@ -#!/bin/bash - -if [ -e ~/.bashrc ]; then - source ~/.bashrc -fi - -# Download fresh copy of MITgcm -cd ../MITgcm/ -if [ ! -d install_dngoldberg ]; then - source install_dngoldberg.sh -else - cd install_dngoldberg - git pull - cd .. -fi Index: sm/trunk-jpl/test/MITgcm/install_dngoldberg.sh =================================================================== --- /issm/trunk-jpl/test/MITgcm/install_dngoldberg.sh (revision 26613) +++ (revision ) @@ -1,13 +1,0 @@ -#!/bin/bash - -#Some cleanup -rm -rf install_dngoldberg - -#Download code from server -git clone https://github.com/dngoldberg/MITgcm -cd MITgcm -git checkout branch_remeshing -cd .. - -#Move -mv MITgcm install_dngoldberg Index: /issm/trunk-jpl/test/NightlyRun/test4003.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test4003.m (revision 26613) +++ /issm/trunk-jpl/test/NightlyRun/test4003.m (revision 26614) @@ -5,10 +5,11 @@ steps=1:12; steps=1:6; +steps=7; final_time=1/365; %To download and recompile MITgcm from scratch: -!rm -rf ${ISSM_DIR}/test/MITgcm/install_dngoldberg -!rm -rf ${ISSM_DIR}/test/MITgcm/build/* -!rm -rf Models +%!rm -rf ${ISSM_DIR}/test/MITgcm/install +%!rm -rf ${ISSM_DIR}/test/MITgcm/build/* +%!rm -rf Models %Organizer @@ -132,5 +133,5 @@ % {{{ GetMITgcm: if perform(org,'GetMITgcm'), - system([pwd '/../MITgcm/get_mitgcm_dngoldberg.sh']); + system([pwd '/../MITgcm/get_mitgcm.sh']); end % }}} @@ -152,5 +153,5 @@ !\mkdir run !\cp ../MITgcm/build/mitgcmuv run - !\cp ../MITgcm/install_dngoldberg/verification/shelfice_2d_remesh/input/* run + !\cp ../MITgcm/install/verification/shelfice_2d_remesh/input/* run !\cp ../MITgcm/input_4003/* run !\cp ../MITgcm/input_4003/data_uncoupled run/data @@ -170,7 +171,7 @@ %Grab lat,long from MITgcm: - long=readbin('run/XG.data',[3 200]); + long=readbin('run/XG.data',[Nx Ny]); long=[long long(:,end)]; long=[long; -105.1250*ones(1,size(long,2))]; - lat=readbin('run/YG.data',[3 200]); + lat=readbin('run/YG.data',[Nx Ny]); lat=[lat -73.8832*ones(size(lat,1),1)]; lat=[lat; lat(end,:)]; @@ -178,5 +179,5 @@ [x,y]=ll2xy(lat(:),long(:),-1); - Nx=size(lat,1); Ny=size(lat,2) + Nx=size(lat,1); Ny=size(lat,2); index=[]; % C D @@ -364,5 +365,5 @@ !\mkdir run !\cp ../MITgcm/build/mitgcmuv run - !\cp ../MITgcm/install_dngoldberg/verification/shelfice_remeshing/input/* run + !\cp ../MITgcm/install/verification/shelfice_remeshing/input/* run !\cp ../MITgcm/input_4003/* run % }}} @@ -672,41 +673,41 @@ %Fields and tolerances to track changes -fnm=['run/SHICE_fwFlux.0000011400.data']; -melting_rate_1=readbin(fnm,[Nx Ny]); -fnm=['run/SHICE_fwFlux.0000011450.data']; -melting_rate_2=readbin(fnm,[Nx Ny]); -fnm=['run/SHICE_fwFlux.0000011500.data']; -melting_rate_3=readbin(fnm,[Nx Ny]); -fnm=['run/SHICE_fwFlux.0000011550.data']; -melting_rate_4=readbin(fnm,[Nx Ny]); -field_names ={'Base1','Melting1','Vx2','Vy2','Thickness2','Base2','MaskOceanLevelset2','FloatingiceMeltingRate2',... - 'Melting2','Vx3','Vy3','Thickness3','Base3','MaskOceanLevelset3','FloatingiceMeltingRate3',... - 'Melting3','Vx4','Vy4','Thickness4','Base4','MaskOceanLevelset4','FloatingiceMeltingRate4','Melting4'}; -field_tolerances={2e-13,1e-13,7e-13,7e-13,1e-13,1e-13,1e-13,1e-12,... - 1e-13, 1e-12, 1e-12, 1e-13, 1e-13, 1e-13, 1e-12,... - 1e-13, 1e-12, 1e-12, 1e-13, 1e-13, 1e-13, 1e-12, 1e-13 }; -field_values={... - (md.results.TransientSolution(1).Base),... - (melting_rate_1(:)),... - (md.results.TransientSolution(2).Vx),... - (md.results.TransientSolution(2).Vy),... - (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).Base),... - (md.results.TransientSolution(2).MaskOceanLevelset),... - (md.results.TransientSolution(2).BasalforcingsFloatingiceMeltingRate),... - (melting_rate_2(:)),... - (md.results.TransientSolution(3).Vx),... - (md.results.TransientSolution(3).Vy),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).Base),... - (md.results.TransientSolution(3).MaskOceanLevelset),... - (md.results.TransientSolution(3).BasalforcingsFloatingiceMeltingRate),... - (melting_rate_3(:)),... - (md.results.TransientSolution(4).Vx),... - (md.results.TransientSolution(4).Vy),... - (md.results.TransientSolution(4).Thickness),... - (md.results.TransientSolution(4).Base),... - (md.results.TransientSolution(4).MaskOceanLevelset),... - (md.results.TransientSolution(4).BasalforcingsFloatingiceMeltingRate),... - (melting_rate_4(:)),... - }; +%fnm=['run/SHICE_fwFlux.0000011400.data']; +%melting_rate_1=readbin(fnm,[Nx Ny]); +%fnm=['run/SHICE_fwFlux.0000011450.data']; +%melting_rate_2=readbin(fnm,[Nx Ny]); +%fnm=['run/SHICE_fwFlux.0000011500.data']; +%melting_rate_3=readbin(fnm,[Nx Ny]); +%fnm=['run/SHICE_fwFlux.0000011550.data']; +%melting_rate_4=readbin(fnm,[Nx Ny]); +%field_names ={'Base1','Melting1','Vx2','Vy2','Thickness2','Base2','MaskOceanLevelset2','FloatingiceMeltingRate2',... +% 'Melting2','Vx3','Vy3','Thickness3','Base3','MaskOceanLevelset3','FloatingiceMeltingRate3',... +% 'Melting3','Vx4','Vy4','Thickness4','Base4','MaskOceanLevelset4','FloatingiceMeltingRate4','Melting4'}; +%field_tolerances={2e-13,1e-13,7e-13,7e-13,1e-13,1e-13,1e-13,1e-12,... +% 1e-13, 1e-12, 1e-12, 1e-13, 1e-13, 1e-13, 1e-12,... +% 1e-13, 1e-12, 1e-12, 1e-13, 1e-13, 1e-13, 1e-12, 1e-13 }; +%field_values={... +% (md.results.TransientSolution(1).Base),... +% (melting_rate_1(:)),... +% (md.results.TransientSolution(2).Vx),... +% (md.results.TransientSolution(2).Vy),... +% (md.results.TransientSolution(2).Thickness),... +% (md.results.TransientSolution(2).Base),... +% (md.results.TransientSolution(2).MaskOceanLevelset),... +% (md.results.TransientSolution(2).BasalforcingsFloatingiceMeltingRate),... +% (melting_rate_2(:)),... +% (md.results.TransientSolution(3).Vx),... +% (md.results.TransientSolution(3).Vy),... +% (md.results.TransientSolution(3).Thickness),... +% (md.results.TransientSolution(3).Base),... +% (md.results.TransientSolution(3).MaskOceanLevelset),... +% (md.results.TransientSolution(3).BasalforcingsFloatingiceMeltingRate),... +% (melting_rate_3(:)),... +% (md.results.TransientSolution(4).Vx),... +% (md.results.TransientSolution(4).Vy),... +% (md.results.TransientSolution(4).Thickness),... +% (md.results.TransientSolution(4).Base),... +% (md.results.TransientSolution(4).MaskOceanLevelset),... +% (md.results.TransientSolution(4).BasalforcingsFloatingiceMeltingRate),... +% (melting_rate_4(:)),... +% };