--- MITgcm_contrib/dgoldberg/streamice/STREAMICE.h 2012/10/01 23:45:14 1.10 +++ MITgcm_contrib/dgoldberg/streamice/STREAMICE.h 2012/10/04 15:40:16 1.13 @@ -1,4 +1,4 @@ -C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----| +C---+----1--+-+----2----+----3----+----4----+----5----+----6----+----7-|--+----| #ifdef ALLOW_STREAMICE @@ -218,7 +218,9 @@ #ifdef USE_ALT_RLOW & R_low_si, #endif - & streamice_sigma_coord, streamice_delsigma + & streamice_sigma_coord, streamice_delsigma, + & H_streamice_prev + _RL H_streamice (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy) _RL U_streamice (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy) @@ -241,10 +243,6 @@ _RL R_low_si (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy) #endif - COMMON /STREAMICE_COST_RL/ - & cost_func1_streamice - _RL cost_func1_streamice(nSx,nSy) - C The following arrays are used for the hybrid stress balance _RL streamice_taubx (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy) @@ -264,9 +262,15 @@ !! IMPORTANT: MELT RATE IN METERS PER YEAR !! POSITIVE WHERE MELTING _RL BDOT_streamice (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy) - + _RL H_streamice_prev (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy) _RL STREAMICE_dummy_array (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy) + + + COMMON /STREAMICE_COST_RL/ + & cost_func1_streamice + _RL cost_func1_streamice(nSx,nSy) + C NOTES : C REAL ARRAYS THAT COMPRISE "STATE": C H_streamice,