Changeset 26614


Ignore:
Timestamp:
11/11/21 16:34:09 (3 years ago)
Author:
dmenemen
Message:

test4003 now uses main MITgcm branch as opposed to dngoldberg branch
RunUncoupledMITgcm exactly reproduces MITgcm/verification/shelfice_2d_remesh

Location:
issm/trunk-jpl/test
Files:
2 deleted
2 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/test/MITgcm/build_4003.sh

    r24121 r26614  
    1111
    1212# Get MITgcm code, if needed
    13 if [ ! -d "$modelpath/../MITgcm/install_dngoldberg" ]; then
     13if [ ! -d "$modelpath/../MITgcm/install" ]; then
    1414    cd $modelpath/../MITgcm
    15     source install_dngoldberg.sh
     15    source install.sh
    1616    cd $modelpath
    1717fi
    … …  
    2424#create MITgcm makefile for this run, if needed
    2525if [ ! -f Makefile ]; then
    26     if [ $hostname == "pleiades" ]; then
    27         $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
    28     else
    29         $modelpath/../MITgcm/install_dngoldberg/tools/genmake2 -mpi -mo ../code_4003 -rd $modelpath/../MITgcm/install_dngoldberg
    30     fi
     26        case $hostname in
     27                "pleiades")
     28                        $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
     29                        ;;
     30                "babylon")
     31                        $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
     32                        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"
     33                        ;;
     34                *)
     35                        $modelpath/../MITgcm/install/tools/genmake2 -mpi -mo $modelpath/../MITgcm/code_4003 -rd $modelpath/../MITgcm/install
     36                        ;;
     37        esac
    3138fi
    3239
    … …  
    3542    make depend
    3643fi
    37 
    38 make -j 4
     44make -j 4 &> Makefile.log

  • issm/trunk-jpl/test/NightlyRun/test4003.m

    r26545 r26614  
    55steps=1:12;
    66steps=1:6;
     7steps=7;
    78final_time=1/365;
    89
    910%To download and recompile MITgcm from scratch:
    10 !rm -rf ${ISSM_DIR}/test/MITgcm/install_dngoldberg
    11 !rm -rf ${ISSM_DIR}/test/MITgcm/build/*
    12 !rm -rf Models
     11%!rm -rf ${ISSM_DIR}/test/MITgcm/install
     12%!rm -rf ${ISSM_DIR}/test/MITgcm/build/*
     13%!rm -rf Models
    1314
    1415%Organizer
    … …  
    132133% {{{ GetMITgcm:
    133134if perform(org,'GetMITgcm'),
    134   system([pwd '/../MITgcm/get_mitgcm_dngoldberg.sh']);
     135  system([pwd '/../MITgcm/get_mitgcm.sh']);
    135136end
    136137% }}}
    … …  
    152153    !\mkdir run
    153154    !\cp ../MITgcm/build/mitgcmuv run
    154     !\cp ../MITgcm/install_dngoldberg/verification/shelfice_2d_remesh/input/* run
     155    !\cp ../MITgcm/install/verification/shelfice_2d_remesh/input/* run
    155156    !\cp ../MITgcm/input_4003/* run
    156157    !\cp ../MITgcm/input_4003/data_uncoupled run/data
    … …  
    170171
    171172        %Grab lat,long from MITgcm:
    172         long=readbin('run/XG.data',[3 200]);
     173        long=readbin('run/XG.data',[Nx Ny]);
    173174        long=[long long(:,end)]; long=[long; -105.1250*ones(1,size(long,2))];
    174         lat=readbin('run/YG.data',[3 200]);
     175        lat=readbin('run/YG.data',[Nx Ny]);
    175176        lat=[lat -73.8832*ones(size(lat,1),1)]; lat=[lat; lat(end,:)];
    176177
    … …  
    178179        [x,y]=ll2xy(lat(:),long(:),-1);
    179180
    180         Nx=size(lat,1); Ny=size(lat,2)
     181        Nx=size(lat,1); Ny=size(lat,2);
    181182        index=[];
    182183        %  C  D
    … …  
    364365        !\mkdir run
    365366        !\cp ../MITgcm/build/mitgcmuv run
    366         !\cp ../MITgcm/install_dngoldberg/verification/shelfice_remeshing/input/* run
     367        !\cp ../MITgcm/install/verification/shelfice_remeshing/input/* run
    367368        !\cp ../MITgcm/input_4003/* run
    368369        % }}}
    … …  
    672673
    673674%Fields and tolerances to track changes
    674 fnm=['run/SHICE_fwFlux.0000011400.data'];
    675 melting_rate_1=readbin(fnm,[Nx Ny]);
    676 fnm=['run/SHICE_fwFlux.0000011450.data'];
    677 melting_rate_2=readbin(fnm,[Nx Ny]);
    678 fnm=['run/SHICE_fwFlux.0000011500.data'];
    679 melting_rate_3=readbin(fnm,[Nx Ny]);
    680 fnm=['run/SHICE_fwFlux.0000011550.data'];
    681 melting_rate_4=readbin(fnm,[Nx Ny]);
    682 field_names     ={'Base1','Melting1','Vx2','Vy2','Thickness2','Base2','MaskOceanLevelset2','FloatingiceMeltingRate2',...
    683         'Melting2','Vx3','Vy3','Thickness3','Base3','MaskOceanLevelset3','FloatingiceMeltingRate3',...
    684         'Melting3','Vx4','Vy4','Thickness4','Base4','MaskOceanLevelset4','FloatingiceMeltingRate4','Melting4'};
    685 field_tolerances={2e-13,1e-13,7e-13,7e-13,1e-13,1e-13,1e-13,1e-12,...
    686         1e-13, 1e-12, 1e-12, 1e-13, 1e-13, 1e-13, 1e-12,...
    687         1e-13, 1e-12, 1e-12, 1e-13, 1e-13, 1e-13, 1e-12, 1e-13 };
    688 field_values={...
    689         (md.results.TransientSolution(1).Base),...
    690         (melting_rate_1(:)),...
    691         (md.results.TransientSolution(2).Vx),...
    692         (md.results.TransientSolution(2).Vy),...
    693         (md.results.TransientSolution(2).Thickness),...
    694         (md.results.TransientSolution(2).Base),...
    695         (md.results.TransientSolution(2).MaskOceanLevelset),...
    696         (md.results.TransientSolution(2).BasalforcingsFloatingiceMeltingRate),...
    697         (melting_rate_2(:)),...
    698         (md.results.TransientSolution(3).Vx),...
    699         (md.results.TransientSolution(3).Vy),...
    700         (md.results.TransientSolution(3).Thickness),...
    701         (md.results.TransientSolution(3).Base),...
    702         (md.results.TransientSolution(3).MaskOceanLevelset),...
    703         (md.results.TransientSolution(3).BasalforcingsFloatingiceMeltingRate),...
    704         (melting_rate_3(:)),...
    705         (md.results.TransientSolution(4).Vx),...
    706         (md.results.TransientSolution(4).Vy),...
    707         (md.results.TransientSolution(4).Thickness),...
    708         (md.results.TransientSolution(4).Base),...
    709         (md.results.TransientSolution(4).MaskOceanLevelset),...
    710         (md.results.TransientSolution(4).BasalforcingsFloatingiceMeltingRate),...
    711         (melting_rate_4(:)),...
    712         };
     675%fnm=['run/SHICE_fwFlux.0000011400.data'];
     676%melting_rate_1=readbin(fnm,[Nx Ny]);
     677%fnm=['run/SHICE_fwFlux.0000011450.data'];
     678%melting_rate_2=readbin(fnm,[Nx Ny]);
     679%fnm=['run/SHICE_fwFlux.0000011500.data'];
     680%melting_rate_3=readbin(fnm,[Nx Ny]);
     681%fnm=['run/SHICE_fwFlux.0000011550.data'];
     682%melting_rate_4=readbin(fnm,[Nx Ny]);
     683%field_names     ={'Base1','Melting1','Vx2','Vy2','Thickness2','Base2','MaskOceanLevelset2','FloatingiceMeltingRate2',...
     684%       'Melting2','Vx3','Vy3','Thickness3','Base3','MaskOceanLevelset3','FloatingiceMeltingRate3',...
     685%       'Melting3','Vx4','Vy4','Thickness4','Base4','MaskOceanLevelset4','FloatingiceMeltingRate4','Melting4'};
     686%field_tolerances={2e-13,1e-13,7e-13,7e-13,1e-13,1e-13,1e-13,1e-12,...
     687%       1e-13, 1e-12, 1e-12, 1e-13, 1e-13, 1e-13, 1e-12,...
     688%       1e-13, 1e-12, 1e-12, 1e-13, 1e-13, 1e-13, 1e-12, 1e-13 };
     689%field_values={...
     690%       (md.results.TransientSolution(1).Base),...
     691%       (melting_rate_1(:)),...
     692%       (md.results.TransientSolution(2).Vx),...
     693%       (md.results.TransientSolution(2).Vy),...
     694%       (md.results.TransientSolution(2).Thickness),...
     695%       (md.results.TransientSolution(2).Base),...
     696%       (md.results.TransientSolution(2).MaskOceanLevelset),...
     697%       (md.results.TransientSolution(2).BasalforcingsFloatingiceMeltingRate),...
     698%       (melting_rate_2(:)),...
     699%       (md.results.TransientSolution(3).Vx),...
     700%       (md.results.TransientSolution(3).Vy),...
     701%       (md.results.TransientSolution(3).Thickness),...
     702%       (md.results.TransientSolution(3).Base),...
     703%       (md.results.TransientSolution(3).MaskOceanLevelset),...
     704%       (md.results.TransientSolution(3).BasalforcingsFloatingiceMeltingRate),...
     705%       (melting_rate_3(:)),...
     706%       (md.results.TransientSolution(4).Vx),...
     707%       (md.results.TransientSolution(4).Vy),...
     708%       (md.results.TransientSolution(4).Thickness),...
     709%       (md.results.TransientSolution(4).Base),...
     710%       (md.results.TransientSolution(4).MaskOceanLevelset),...
     711%       (md.results.TransientSolution(4).BasalforcingsFloatingiceMeltingRate),...
     712%       (melting_rate_4(:)),...
     713%       };
Note: See TracChangeset for help on using the changeset viewer.