--- MITgcm_contrib/darwin2/pkg/darwin/SPECTRAL.h 2012/07/30 15:21:51 1.2 +++ MITgcm_contrib/darwin2/pkg/darwin/SPECTRAL.h 2012/08/23 21:48:24 1.4 @@ -1,12 +1,14 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/darwin2/pkg/darwin/SPECTRAL.h,v 1.2 2012/07/30 15:21:51 jahn Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/darwin2/pkg/darwin/SPECTRAL.h,v 1.4 2012/08/23 21:48:24 jahn Exp $ C $Name: $ C SPECTRAL.h C description: spectral runtime parameters and fields C darwin_waves :: 'central' wavelengths of wavebands (nm) - COMMON/SPECTRAL_PARAMS_R/darwin_waves +C darwin_wavebands :: waveband boundaries (nm) + COMMON/SPECTRAL_PARAMS_R/darwin_waves, darwin_wavebands _RL darwin_waves(tlam) + _RL darwin_wavebands(tlam+1) C WtouEins :: W to uEin/s conversion factor COMMON/darwin_oasim/ WtouEins @@ -22,10 +24,10 @@ COMMON /SPECTRAL_OUPUT/ #ifdef DAR_DIAG_IRR - & Edave,Esave,Euave,Eutave, + & Edave,Esave,Euave,Estave,Eutave, #endif #ifdef DAR_DIAG_IRR_AMPS - & c1ave,c2ave, + & amp1ave,amp2ave, #endif #ifdef DAR_DIAG_ABSORP & aave, @@ -45,11 +47,12 @@ _RL Edave(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nR,nSx,nSy,tlam) _RL Esave(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nR,nSx,nSy,tlam) _RL Euave(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nR,nSx,nSy,tlam) + _RL Estave(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nR,nSx,nSy,tlam) _RL Eutave(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nR,nSx,nSy,tlam) #endif #ifdef DAR_DIAG_IRR_AMPS - _RL c1ave(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nR,nSx,nSy,tlam) - _RL c2ave(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nR,nSx,nSy,tlam) + _RL amp1ave(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nR,nSx,nSy,tlam) + _RL amp2ave(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nR,nSx,nSy,tlam) #endif #ifdef DAR_DIAG_ABSORP _RL aave(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nR,nSx,nSy,tlam)