From 0df9c21c1607e2661625747d77e83721af46dc99 Mon Sep 17 00:00:00 2001 From: Aidan Heerdegen Date: Fri, 31 May 2019 12:23:13 +1000 Subject: [PATCH 1/2] https://github.com/mom-ocean/MOM5/issues/287 Fixed two incorrect CF standard_names: ocean_x_mass_transport -> ocean_mass_x_transport ocean_y_mass_transport -> ocean_mass_y_transport --- src/mom5/ocean_diag/ocean_adv_vel_diag.F90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mom5/ocean_diag/ocean_adv_vel_diag.F90 b/src/mom5/ocean_diag/ocean_adv_vel_diag.F90 index 12f55fcc0e..54bdfa447b 100644 --- a/src/mom5/ocean_diag/ocean_adv_vel_diag.F90 +++ b/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), & From dfbf81ebee8756e393bc0f94d5b0c55b8226a737 Mon Sep 17 00:00:00 2001 From: Aidan Heerdegen Date: Fri, 31 May 2019 12:59:38 +1000 Subject: [PATCH 2/2] Made OASIS compilation conditional on compiling ACCESS model in travis to isolate OASIS errors --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff1072d466..5715b89697 100644 --- a/.travis.yml +++ b/.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 \ No newline at end of file +# - codecov --gcov-exec=gcov-4.8