Index: /issm/trunk-jpl/test/MITgcm/code_4003/SIZE.h =================================================================== --- /issm/trunk-jpl/test/MITgcm/code_4003/SIZE.h (revision 26544) +++ /issm/trunk-jpl/test/MITgcm/code_4003/SIZE.h (revision 26545) @@ -48,7 +48,7 @@ & OLy = 3, & nSx = 1, - & nSy = 4, + & nSy = 1, & nPx = 1, - & nPy = 1, + & nPy = 4, & Nx = sNx*nSx*nPx, & Ny = sNy*nSy*nPy, @@ -63,5 +63,2 @@ & MAX_OLY = OLy ) - INTEGER nobcs - PARAMETER ( nobcs = 4 ) - Index: /issm/trunk-jpl/test/MITgcm/input_4003/data =================================================================== --- /issm/trunk-jpl/test/MITgcm/input_4003/data (revision 26544) +++ /issm/trunk-jpl/test/MITgcm/input_4003/data (revision 26545) @@ -1,3 +1,3 @@ -#:::==================== +# ==================== # | Model parameters | # ==================== @@ -5,65 +5,50 @@ # Continuous equation parameters &PARM01 -# momstepping=.FALSE., -# tempstepping=.FALSE., -# saltstepping=.FALSE., - Tref = 90*-1.9, - Sref = 90*34.4, + tRef = 90*-1.9, + sRef = 90*34.4, + eosType='JMD95Z', + HeatCapacity_Cp = 3974.0, + rhoConst=1030., + gravity=9.81, viscAr=1.E-3, -#viscAh=600.0, - viscAhGrid=0.2, - viscA4Grid=0.02, + viscAh= 300., no_slip_sides=.FALSE., no_slip_bottom=.FALSE., - diffKhT= 100.0, -#diffKhT= 600.0, + diffKhT= 10., diffKrT=5.E-5, - diffKhS= 100.0, -#diffKhS= 600.0, + diffKhS= 10., diffKrS=5.E-5, bottomDragQuadratic=2.5E-3, - staggerTimestep = .true., - tempAdvScheme=30, - saltAdvScheme=30, - vectorInvariantMomentum = .true., -### momImplVertAdv=.true., - tempImplVertAdv=.true., - saltImplVertAdv=.true., - eosType='JMD95Z', -#tAlpha = 2.E-4, -#sBeta = 7.4E-4, - HeatCapacity_cp = 3974.0, - rhoConst=1000., - rhoNil=1000., - gravity=9.81, - gBaro=9.81, - implicitDiffusion = .true., - implicitViscosity = .true., - rigidLid=.FALSE., + staggerTimestep = .TRUE., + tempAdvScheme=77, + saltAdvScheme=77, + vectorInvariantMomentum = .TRUE., +# momImplVertAdv=.TRUE., +#tempImplVertAdv=.TRUE., +#saltImplVertAdv=.TRUE., + implicitDiffusion = .TRUE., + implicitViscosity = .TRUE., + selectImplicitDrag = 2, implicitFreeSurface=.TRUE., - useRealFreshWaterFlux = .true., + useRealFreshWaterFlux = .TRUE., exactConserv=.TRUE., -# start nlfs with rstar -#select_rStar=2, +# start NLFS (without rstar) nonlinFreeSurf=4, - hFacInf=0.2, + hFacInf=0.05, hFacSup=2.0, -# end nlfs with rstar - hFacMin=0.2, +# end NLFS + hFacMin=0.10, #integr_GeoPot = 1, -#ivdc_kappa = 0.005., -#implicitDiffusion=.true., -#implicitViscosity=.true., -#useCDscheme=.true., -#nonHydrostatic=.true., -#allowFreezing = .true., + ivdc_kappa = 1., + useJamartWetPoints=.TRUE., + selectBotDragQuadr=1, +#bottomVisc_pCell=.TRUE., +#- readBinaryPrec=64, -#writeBinaryPrec=64, - debuglevel = 5, - selectCoriMap = 0, - f0 = 0.0, + writeBinaryPrec=64, useSingleCpuIO=.TRUE., - globalFiles=.TRUE., - useCoriolis=.TRUE., +#globalFiles=.TRUE., + debuglevel = 2, + plotLevel = 0, & @@ -72,62 +57,53 @@ cg2dMaxIters=300, cg2dTargetResidual=1.E-11, -# cg2dMinColumnEps = 1. -# pReleaseVisc = 1. -#cg3dMaxIters=40, -#cg3dTargetResidual=1.E-13, +#printResidualFreq=100, & #Time stepping parameters &PARM03 - niter0=11395, - nTimeSteps=1440, -# nTimeSteps=20, -# startTime=0., -# startTime = 0., -#startTime=62208000., -#startTime=15552000., -#endTime=31104000., -#endTime=86400., -# deltaT=300.0, - deltaT=60.0, -### deltaT=1200.0, - forcing_In_AB = .false., -#rCD = 0.9896, +#nIter0=2880, +#nTimeSteps=288, +#startTime=0., +#endTime=2592000., + deltaT=300.0, + forcing_In_AB = .FALSE., abEps=0.1, - cAdjFreq = -1., - pChkptFreq=3000, - chkptFreq=3000.0, -# pChkptFreq=600.0, -# chkptFreq=600.0, - dumpFreq=3000, -# monitorFreq=15552000., -# monitorSelect=0, - monitorFreq=60., + pChkptFreq= 2592000., + chkptFreq = 2592000., + dumpFreq = 86400., + monitorFreq= 7200., + monitorSelect=1, + monitorFreq=1800., + dumpFreq = 10800., +#- for testing purpose: + nIter0=2898, + nTimeSteps=20, +#dumpFreq = 1200., + monitorFreq=1., & # Gridding parameters &PARM04 - useMin4hFacEdges=.TRUE., usingCartesianGrid=.FALSE., usingSphericalPolarGrid=.TRUE., -#delR = 10., 10., 10., 10., 10., 10., 10., 10.01, 10.03, 10.11, -#10.32, 10.8, 11.76, 13.42, 16.04, 19.82, 24.85, 31.1, 38.42, 46.5, -#55., 63.5, 71.58, 78.9, 85.15, 90.18, 93.96, 96.58, 98.25, 99.25, -#100.01, 101.33, 104.56, 111.33, 122.83, 139.09, 158.94, 180.83, 203.55, 226.5, -#249.5, 272.5, 295.5, 318.5, 341.5, 364.5, 387.5, 410.5, 433.5, 456.5, delR=90*10., - delX=3*.125, + delX=1*.125, delY=200*.0078125, -# delYFile='dlat.bin', -# delY=30*10e3, - xgOrigin = -105.5, - ygOrigin = -75.4457, + xgOrigin = 0., + ygOrigin = -75.5, + pCellMix_select=20, + pcellMix_delR = 10., +#interViscAr_pCell = .TRUE., +#interDiffKr_pCell = .TRUE., + pCellMix_viscAr = 90*1.E-3, + pCellMix_diffKr = 90*1.E-4, +# current default: diffKzT=5.E-5, viscAz=1.E-3, & # Input datasets &PARM05 - bathyFile='bathy.box', - hydrogThetaFile='theta.init', - hydrogSaltFile='salt.init', - pSurfInitFile='etainit.round.bin', + bathyFile='bathy_flat.bin', + hydrogThetaFile='temp_ini.bin', + hydrogSaltFile ='salt_ini.bin', +# pSurfInitFile ='etai_ini.bin' & Index: /issm/trunk-jpl/test/MITgcm/input_4003/data.shelfice =================================================================== --- /issm/trunk-jpl/test/MITgcm/input_4003/data.shelfice (revision 26544) +++ /issm/trunk-jpl/test/MITgcm/input_4003/data.shelfice (revision 26545) @@ -16,5 +16,7 @@ SHELFICEmergeThreshold = 0.10, #-- - SHELFICEtopoFile='icetopo.bin', - SHELFICEwriteState = .TRUE., + SHELFICEtopoFile='shelficeTopo.Lin.bin', + SHELFICEmassFile='shelficeMass.Lin.bin', + SHELFICEMassDynTendFile='shelfice_dMdt.r02.bin', +#SHELFICEwriteState = .TRUE., & Index: /issm/trunk-jpl/test/MITgcm/input_4003/data_uncoupled =================================================================== --- /issm/trunk-jpl/test/MITgcm/input_4003/data_uncoupled (revision 26544) +++ /issm/trunk-jpl/test/MITgcm/input_4003/data_uncoupled (revision 26545) @@ -1,3 +1,3 @@ -#:::==================== +# ==================== # | Model parameters | # ==================== @@ -5,65 +5,50 @@ # Continuous equation parameters &PARM01 -# momstepping=.FALSE., -# tempstepping=.FALSE., -# saltstepping=.FALSE., - Tref = 90*-1.9, - Sref = 90*34.4, + tRef = 90*-1.9, + sRef = 90*34.4, + eosType='JMD95Z', + HeatCapacity_Cp = 3974.0, + rhoConst=1030., + gravity=9.81, viscAr=1.E-3, -#viscAh=600.0, - viscAhGrid=0.2, - viscA4Grid=0.02, + viscAh= 300., no_slip_sides=.FALSE., no_slip_bottom=.FALSE., - diffKhT= 100.0, -#diffKhT= 600.0, + diffKhT= 10., diffKrT=5.E-5, - diffKhS= 100.0, -#diffKhS= 600.0, + diffKhS= 10., diffKrS=5.E-5, bottomDragQuadratic=2.5E-3, - staggerTimestep = .true., - tempAdvScheme=30, - saltAdvScheme=30, - vectorInvariantMomentum = .true., -### momImplVertAdv=.true., - tempImplVertAdv=.true., - saltImplVertAdv=.true., - eosType='JMD95Z', -#tAlpha = 2.E-4, -#sBeta = 7.4E-4, - HeatCapacity_cp = 3974.0, - rhoConst=1000., - rhoNil=1000., - gravity=9.81, - gBaro=9.81, - implicitDiffusion = .true., - implicitViscosity = .true., - rigidLid=.FALSE., + staggerTimestep = .TRUE., + tempAdvScheme=77, + saltAdvScheme=77, + vectorInvariantMomentum = .TRUE., +# momImplVertAdv=.TRUE., +#tempImplVertAdv=.TRUE., +#saltImplVertAdv=.TRUE., + implicitDiffusion = .TRUE., + implicitViscosity = .TRUE., + selectImplicitDrag = 2, implicitFreeSurface=.TRUE., - useRealFreshWaterFlux = .true., + useRealFreshWaterFlux = .TRUE., exactConserv=.TRUE., -# start nlfs with rstar -#select_rStar=2, +# start NLFS (without rstar) nonlinFreeSurf=4, - hFacInf=0.2, + hFacInf=0.05, hFacSup=2.0, -# end nlfs with rstar - hFacMin=0.2, +# end NLFS + hFacMin=0.10, #integr_GeoPot = 1, -#ivdc_kappa = 0.005., -#implicitDiffusion=.true., -#implicitViscosity=.true., -#useCDscheme=.true., -#nonHydrostatic=.true., -#allowFreezing = .true., + ivdc_kappa = 1., + useJamartWetPoints=.TRUE., + selectBotDragQuadr=1, +#bottomVisc_pCell=.TRUE., +#- readBinaryPrec=64, -#writeBinaryPrec=64, - debuglevel = 5, - selectCoriMap = 0, - f0 = 0.0, + writeBinaryPrec=64, useSingleCpuIO=.TRUE., - globalFiles=.TRUE., - useCoriolis=.TRUE., +#globalFiles=.TRUE., + debuglevel = 2, + plotLevel = 0, & @@ -72,60 +57,53 @@ cg2dMaxIters=300, cg2dTargetResidual=1.E-11, -# cg2dMinColumnEps = 1. -# pReleaseVisc = 1. -#cg3dMaxIters=40, -#cg3dTargetResidual=1.E-13, +#printResidualFreq=100, & #Time stepping parameters &PARM03 - niter0=11395, -# nTimeSteps=25920000, +#nIter0=2880, +#nTimeSteps=288, +#startTime=0., +#endTime=2592000., + deltaT=300.0, + forcing_In_AB = .FALSE., + abEps=0.1, + pChkptFreq= 2592000., + chkptFreq = 2592000., + dumpFreq = 86400., + monitorFreq= 7200., + monitorSelect=1, + monitorFreq=1800., + dumpFreq = 10800., +#- for testing purpose: + nIter0=2898, nTimeSteps=20, -# startTime=0., -# startTime = 0., -#startTime=62208000., -#startTime=15552000., -#endTime=31104000., - deltaT=300.0, -### deltaT=1200.0, - forcing_In_AB = .false., -#rCD = 0.9896, - abEps=0.1, - cAdjFreq = -1., - pChkptFreq=3000, - chkptFreq=3000.0, -# pChkptFreq=600.0, -# chkptFreq=600.0, - dumpFreq=3000, -# monitorFreq=15552000., -# monitorSelect=0, -# monitorFreq=31104000., +#dumpFreq = 1200., + monitorFreq=1., & # Gridding parameters &PARM04 - useMin4hFacEdges=.TRUE., usingCartesianGrid=.FALSE., usingSphericalPolarGrid=.TRUE., -#delR = 10., 10., 10., 10., 10., 10., 10., 10.01, 10.03, 10.11, -#10.32, 10.8, 11.76, 13.42, 16.04, 19.82, 24.85, 31.1, 38.42, 46.5, -#55., 63.5, 71.58, 78.9, 85.15, 90.18, 93.96, 96.58, 98.25, 99.25, -#100.01, 101.33, 104.56, 111.33, 122.83, 139.09, 158.94, 180.83, 203.55, 226.5, -#249.5, 272.5, 295.5, 318.5, 341.5, 364.5, 387.5, 410.5, 433.5, 456.5, delR=90*10., - delX=3*.125, + delX=1*.125, delY=200*.0078125, -# delYFile='dlat.bin', -# delY=30*10e3, - xgOrigin = -105.5, - ygOrigin = -75.4457, + xgOrigin = 0., + ygOrigin = -75.5, + pCellMix_select=20, + pcellMix_delR = 10., +#interViscAr_pCell = .TRUE., +#interDiffKr_pCell = .TRUE., + pCellMix_viscAr = 90*1.E-3, + pCellMix_diffKr = 90*1.E-4, +# current default: diffKzT=5.E-5, viscAz=1.E-3, & # Input datasets &PARM05 - bathyFile='bathy.box', - hydrogThetaFile='theta.init', - hydrogSaltFile='salt.init', - pSurfInitFile='etainit.round.bin', + bathyFile='bathy_flat.bin', + hydrogThetaFile='temp_ini.bin', + hydrogSaltFile ='salt_ini.bin', +# pSurfInitFile ='etai_ini.bin' & Index: /issm/trunk-jpl/test/MITgcm/input_4003/eedata =================================================================== --- /issm/trunk-jpl/test/MITgcm/input_4003/eedata (revision 26544) +++ /issm/trunk-jpl/test/MITgcm/input_4003/eedata (revision 26545) @@ -1,11 +1,11 @@ # Example "eedata" file # Lines beginning "#" are comments -# nTx - No. threads per process in X -# nTy - No. threads per process in Y +# nTx :: No. threads per process in X +# nTy :: No. threads per process in Y +# debugMode :: print debug msg (sequence of S/R calls) &EEPARMS useCoupler=.TRUE., debugMode=.TRUE., & -# Note: Some systems use & as the -# namelist terminator. Other systems -# use a / character (as shown here). +# Note: Some systems use & as the namelist terminator (as shown here). +# Other systems use a / character. Index: /issm/trunk-jpl/test/MITgcm/input_4003/eedata_uncoupled =================================================================== --- /issm/trunk-jpl/test/MITgcm/input_4003/eedata_uncoupled (revision 26544) +++ /issm/trunk-jpl/test/MITgcm/input_4003/eedata_uncoupled (revision 26545) @@ -1,11 +1,10 @@ # Example "eedata" file # Lines beginning "#" are comments -# nTx - No. threads per process in X -# nTy - No. threads per process in Y +# nTx :: No. threads per process in X +# nTy :: No. threads per process in Y +# debugMode :: print debug msg (sequence of S/R calls) &EEPARMS useCoupler=.FALSE., -# debugMode=.TRUE., & -# Note: Some systems use & as the -# namelist terminator. Other systems -# use a / character (as shown here). +# Note: Some systems use & as the namelist terminator (as shown here). +# Other systems use a / character. Index: /issm/trunk-jpl/test/NightlyRun/test4003.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test4003.m (revision 26544) +++ /issm/trunk-jpl/test/NightlyRun/test4003.m (revision 26545) @@ -3,13 +3,12 @@ % %Script control parameters -steps=1:11; -steps=1:5; -steps=6; +steps=1:12; +steps=1:6; 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_dngoldberg +!rm -rf ${ISSM_DIR}/test/MITgcm/build/* +!rm -rf Models %Organizer @@ -21,9 +20,9 @@ % {{{ Parameters: if perform(org,'Parameters'), - Nx=3; %number of longitude cells + Nx=1; %number of longitude cells Ny=200; %number of latitude cells Nz=90; %number of MITgcm vertical cells nPx=1; %number of MITgcm processes to use in x direction - nPy=1; %number of MITgcm processes to use in y direction + nPy=4; %number of MITgcm processes to use in y direction xgOrigin=1; %origin of longitude ygOrigin=1; %origin of latitude