Skip to content

Commit

Permalink
Python3 fixes. mom-ocean#328
Browse files Browse the repository at this point in the history
  • Loading branch information
nichannah committed Dec 8, 2016
1 parent f260f57 commit 94d8205
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/MOM6
Submodule MOM6 updated 34 files
+5 −0 config_src/solo_driver/MOM_surface_forcing.F90
+375 −12 src/ALE/MOM_ALE.F90
+78 −597 src/ALE/MOM_regridding.F90
+13 −60 src/ALE/regrid_consts.F90
+31 −18 src/core/MOM.F90
+4 −0 src/core/MOM_PressureForce.F90
+77 −2 src/core/MOM_PressureForce_analytic_FV.F90
+13 −2 src/core/MOM_barotropic.F90
+3 −3 src/core/MOM_dynamics_legacy_split.F90
+15 −13 src/core/MOM_dynamics_split_RK2.F90
+4 −4 src/core/MOM_dynamics_unsplit.F90
+2 −2 src/core/MOM_dynamics_unsplit_RK2.F90
+12 −4 src/core/MOM_forcing_type.F90
+127 −0 src/core/MOM_grid.F90
+62 −23 src/diagnostics/MOM_diag_to_Z.F90
+0 −1 src/diagnostics/MOM_obsolete_params.F90
+365 −38 src/framework/MOM_checksums.F90
+813 −744 src/framework/MOM_diag_mediator.F90
+0 −590 src/framework/MOM_diag_remap.F90
+3 −38 src/framework/MOM_diag_vkernels.F90
+0 −12 src/framework/MOM_error_handler.F90
+1 −0 src/framework/MOM_hor_index.F90
+21 −111 src/framework/MOM_string_functions.F90
+2 −2 src/initialization/MOM_fixed_initialization.F90
+2 −0 src/initialization/MOM_grid_initialize.F90
+23 −2 src/initialization/MOM_shared_initialization.F90
+16 −4 src/initialization/MOM_state_initialization.F90
+1 −1 src/initialization/MOM_tracer_initialization_from_Z.F90
+3 −3 src/parameterizations/lateral/MOM_mixed_layer_restrat.F90
+2 −2 src/parameterizations/lateral/MOM_thickness_diffuse.F90
+2 −2 src/parameterizations/vertical/MOM_bulk_mixed_layer.F90
+1 −1 src/parameterizations/vertical/MOM_diabatic_aux.F90
+6 −6 src/parameterizations/vertical/MOM_diabatic_driver.F90
+36 −8 src/parameterizations/vertical/MOM_set_viscosity.F90
14 changes: 10 additions & 4 deletions tools/tests/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,15 @@ def build_shared(self, platform, compiler, build):
except sp.CalledProcessError as e:
ret = e.returncode
output = e.output
print(output, file=sys.stderr)
finally:
os.chdir(saved_path)

output = output.decode('utf-8')
if ret:
print(output, file=sys.stderr)

with open(os.path.join(shared_dir, 'build.out'), 'w') as f:
f.write(str(output))
f.write(output)

return ret, shared_dir

Expand Down Expand Up @@ -112,11 +115,14 @@ def build_model(self, platform='raijin', compiler='gnu', build='DEBUG', memory_t
except sp.CalledProcessError as e:
ret = e.returncode
output = e.output
print(output, file=sys.stderr)
finally:
os.chdir(saved_path)

output = output.decode('utf-8')
if ret:
print(output, file=sys.stderr)

with open(os.path.join(model_dir, 'build.out'), 'w') as f:
f.write(str(output))
f.write(output)

return ret, model_dir

0 comments on commit 94d8205

Please sign in to comment.