Misplaced #endif in def_floats.F

[m.hadfield]

In ROMS/Utility/def_floats.F, lines 493-501 are

# ifdef SOLVE3D
          ELSE IF (TRIM(var_name(i)).eq.'depth') THEN
            got_var(iddpth)=.TRUE.
            fltVid(iddpth,ng)=var_id(i)
          ELSE IF (TRIM(var_name(i)).eq.TRIM(Vname(1,idDano))) THEN
            got_var(idDano)=.TRUE.
            fltVid(idDano,ng)=var_id(i)
          END IF
# endif

This leads to the END IF being omitted when SOLVE3D is undefined. The last two lines need to be swapped, ie:

# ifdef SOLVE3D
          ELSE IF (TRIM(var_name(i)).eq.'depth') THEN
            got_var(iddpth)=.TRUE.
            fltVid(iddpth,ng)=var_id(i)
          ELSE IF (TRIM(var_name(i)).eq.TRIM(Vname(1,idDano))) THEN
            got_var(idDano)=.TRUE.
            fltVid(idDano,ng)=var_id(i)
# endif
          END IF

[arango]

Yes, I missed that one. I also corrected wrt_avg.F and wrt_diags.F since it was writing the wrong time variable. Thank you Mark for reporting this problem too.