Fix CF Names (#288)

* #287

Fixed two incorrect CF standard_names:

ocean_x_mass_transport -> ocean_mass_x_transport
ocean_y_mass_transport -> ocean_mass_y_transport

* Made OASIS compilation conditional on compiling ACCESS model in travis
to isolate OASIS errors

.travis.yml

@@ -33,12 +33,11 @@ install:
     - sudo apt-get install csh gcc-4.8 gfortran-4.8 libgomp1 openmpi-bin libopenmpi-dev  libnetcdf-dev  netcdf-bin
 
 before_script:
-    - git clone --depth=1 https://github.com/OceansAus/oasis3-mct.git
-    - (cd oasis3-mct && make ubuntu)
+    - [[ $TYPE =~ (^ACCESS) ]] && git clone --depth=1 https://github.com/OceansAus/oasis3-mct.git && (cd oasis3-mct && make ubuntu)
 
 script: 
     - cd exp && ./MOM_compile.csh --type $TYPE --platform travis --use_netcdf4
 
 # after_success:
 #     - find .
-#     - codecov --gcov-exec=gcov-4.8
+#     - codecov --gcov-exec=gcov-4.8

src/mom5/ocean_diag/ocean_adv_vel_diag.F90

@@ -231,11 +231,11 @@ subroutine ocean_adv_vel_diag_init(Grid, Domain, Time, Time_steps, T_prog, Dens,
 id_tx_trans = register_diag_field ('ocean_model','tx_trans', Grd%tracer_axes_flux_x(1:3),&
               Time%model_time, 'T-cell i-mass transport',trim(transport_dims),           &
               missing_value=missing_value, range=(/-1e20,1e20/),                         &
-              standard_name='ocean_x_mass_transport')
+              standard_name='ocean_mass_x_transport')
 id_ty_trans = register_diag_field ('ocean_model','ty_trans', Grd%tracer_axes_flux_y(1:3), &
               Time%model_time, 'T-cell j-mass transport',trim(transport_dims),            &
               missing_value=missing_value, range=(/-1e20,1e20/),                          &
-              standard_name='ocean_y_mass_transport')
+              standard_name='ocean_mass_y_transport')
 id_tx_trans_int_z = register_diag_field ('ocean_model','tx_trans_int_z',        &
               Grd%tracer_axes_flux_x(1:2), Time%model_time,                     &
               'T-cell i-mass transport vertically summed',trim(transport_dims), &