From e6c1bbc30614e9d17b45f3746f508c0bf823ddce Mon Sep 17 00:00:00 2001 From: Leif Denby Date: Wed, 16 May 2018 12:23:00 +0100 Subject: [PATCH 01/17] add apt-get dependencies --- .travis.yml | 5 +++++ .travis.yml.swp | Bin 0 -> 12288 bytes 2 files changed, 5 insertions(+) create mode 100644 .travis.yml create mode 100644 .travis.yml.swp diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..a34af8c6 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,5 @@ +before_install: + # Install MONC's dependencies + - apt-get install -y mpich fftw3-dev + # Install MONC's python libraries + - apt-get install -y python-numpy python-scipy python-matplotlib ipython ipython-notebook diff --git a/.travis.yml.swp b/.travis.yml.swp new file mode 100644 index 0000000000000000000000000000000000000000..5cdcfc8ad60d8e88b4c694a7adb13bd3cfe10bbb GIT binary patch literal 12288 zcmeI%y-ve05C?D<35kUd0S|D{0T`UN6jZ^=)S)oJz=E8_Z7m$zN(`t2F!32x}OT%6w)C2n8z2h@uWSQu-JjW$0nd-sP+uYxfta-F2*!r!Bi zl6N{sy>6s!B6Mmqp-jz@hp&dMk@7s3&K9lAnxqx^T->T6nq<1>5T+miff)%bv+jPU zT{dfOZ_&p3`HcFa4Fn(n0SG_<0uX=z1RyXE0^T*)W4P!-b=k!#H-6=+M1lYWAOHaf zKmY;|fB*y_009U Date: Wed, 16 May 2018 12:59:49 +0100 Subject: [PATCH 02/17] apt-get with sudo --- .travis.yml | 4 ++-- .travis.yml.swp | Bin 12288 -> 12288 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a34af8c6..ad9141a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ before_install: # Install MONC's dependencies - - apt-get install -y mpich fftw3-dev + - sudo apt-get install -y mpich fftw3-dev # Install MONC's python libraries - - apt-get install -y python-numpy python-scipy python-matplotlib ipython ipython-notebook + - sudo apt-get install -y python-numpy python-scipy python-matplotlib ipython ipython-notebook diff --git a/.travis.yml.swp b/.travis.yml.swp index 5cdcfc8ad60d8e88b4c694a7adb13bd3cfe10bbb..11b72bfd7e07dded0ca673e1dd1a390ecfde3110 100644 GIT binary patch delta 88 zcmZojXh_)bl9{!%Bu&?1^E+lS8Ljtx3=H!83=9kc3=FJ53Isj?`4@nA2@p2`F-Ts6 df3u>%M?MY(1zm;W(vAl~6%=$QtLryTUaKDr0JJ<22><{9 From b0c9a58726e0115a9daee0ac8134ac1de659183c Mon Sep 17 00:00:00 2001 From: Leif Denby Date: Wed, 16 May 2018 13:10:04 +0100 Subject: [PATCH 03/17] add dummy test with pytest --- .pytest_cache/v/cache/nodeids | 3 +++ .travis.yml | 2 ++ .../__pycache__/test_dummy.cpython-27-PYTEST.pyc | Bin 0 -> 425 bytes tests/test_dummy.py | 2 ++ 4 files changed, 7 insertions(+) create mode 100644 .pytest_cache/v/cache/nodeids create mode 100644 tests/__pycache__/test_dummy.cpython-27-PYTEST.pyc create mode 100644 tests/test_dummy.py diff --git a/.pytest_cache/v/cache/nodeids b/.pytest_cache/v/cache/nodeids new file mode 100644 index 00000000..08a06b26 --- /dev/null +++ b/.pytest_cache/v/cache/nodeids @@ -0,0 +1,3 @@ +[ + "tests/test_dummy.py::test_dummy" +] \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index ad9141a8..e6eb66fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,3 +3,5 @@ before_install: - sudo apt-get install -y mpich fftw3-dev # Install MONC's python libraries - sudo apt-get install -y python-numpy python-scipy python-matplotlib ipython ipython-notebook + +script: pytest diff --git a/tests/__pycache__/test_dummy.cpython-27-PYTEST.pyc b/tests/__pycache__/test_dummy.cpython-27-PYTEST.pyc new file mode 100644 index 0000000000000000000000000000000000000000..93deeff881672cf9fea0176fd97d0f77491ede1a GIT binary patch literal 425 zcmb`DzfQw25XLV_`B%!qhLD&eA>tQ6s1kbzx@ECKY=NsdiR_C|b{>-VU`2xOQl&#@ zPWC7JyYtUJXWv)Lue+b}mWXQ1DN^VfGu}fCMnVlynat~yb{Xv!RGyGY=@Y3_soCZk z>fJA5b6_Q~o`tp8v$nZ7n;b$%5*0l4-g&ER6`Ih@y(o26kOr1p5&jTfRW{ k;Ia_sjNA**bafS8u=|&G&cS)~of#VYG&LjNwxVnL1IcJ(!T Date: Wed, 16 May 2018 13:13:22 +0100 Subject: [PATCH 04/17] add pytest install --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index e6eb66fb..c6473f0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,5 +3,7 @@ before_install: - sudo apt-get install -y mpich fftw3-dev # Install MONC's python libraries - sudo apt-get install -y python-numpy python-scipy python-matplotlib ipython ipython-notebook + # install pytest for running tests + - sudo apt-get install -y python-logilab-common script: pytest From 07b71b4bb7b52cc468f9961d82f0273c1f679d3e Mon Sep 17 00:00:00 2001 From: Leif Denby Date: Wed, 16 May 2018 13:20:16 +0100 Subject: [PATCH 05/17] add more compile dependencies --- .travis.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/.travis.yml b/.travis.yml index c6473f0f..237f807b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,5 +5,39 @@ before_install: - sudo apt-get install -y python-numpy python-scipy python-matplotlib ipython ipython-notebook # install pytest for running tests - sudo apt-get install -y python-logilab-common + # Install HDF5 compiled for parallel use + - sudo apt-get install -y libhdf5-mpich-dev + # Install GNU m4: + - apt-get install -y m4 + +install: + - export NETCDF_C_VERSION=4.4.0 + - export NETCDF_FORTRAN_VERSION=4.4.3 + # Download: + - wget https://github.com/Unidata/netcdf-c/archive/v${NETCDF_C_VERSION}.tar.gz + - tar -xf v${NETCDF_C_VERSION}.tar.gz + - cd netcdf-c-${NETCDF_C_VERSION}/ + # Configure: + - CC=mpicc CPPFLAGS=-I/usr/include/hdf5/mpich LDFLAGS=-L/usr/lib/x86_64-linux-gnu/hdf5/mpich ./configure --enable-parallel-tests --disable-dap --prefix=/usr + # Build and install: + - make check + - sudo make install + # change directory to home + - cd + # Build NetCDF Fortran static libraries + # Download: + - wget https://github.com/Unidata/netcdf-fortran/archive/v${NETCDF_FORTRAN_VERSION}.tar.gz + - tar -xf v${NETCDF_FORTRAN_VERSION}.tar.gz + - cd netcdf-fortran-${NETCDF_FORTRAN_VERSION}/ + # Configure: + - H5DIR=/usr + - NCDIR=/usr + - NFDIR=/usr + - ODIR=/usr + - CC=mpicc FC=mpif90 F77=mpif77 CPPFLAGS="-I${NCDIR}/include -I${H5DIR}/include/hdf5/mpich -I${ODIR}/include" LDFLAGS="-L${NCDIR}/lib -L${H5DIR}/lib/x86_64-linux-gnu/hdf5/mpich -L${ODIR}/lib" LD_LIBRARY_PATH=${NCDIR}/lib:${H5DIR}/lib:${ODIR}/lib LIBS="-lnetcdf -lhdf5_hl -lhdf5 -lz" ./configure --disable-shared --prefix=${NCDIR} + # Build and install: + - make check + - sudo make install + script: pytest From 0cd2122f62310ed4766da95cb956a077f2b2a18d Mon Sep 17 00:00:00 2001 From: Leif Denby Date: Wed, 16 May 2018 13:24:07 +0100 Subject: [PATCH 06/17] Set OS version and mpich lib --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 237f807b..b7e1e931 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ +os: trusty + before_install: # Install MONC's dependencies - sudo apt-get install -y mpich fftw3-dev @@ -6,7 +8,7 @@ before_install: # install pytest for running tests - sudo apt-get install -y python-logilab-common # Install HDF5 compiled for parallel use - - sudo apt-get install -y libhdf5-mpich-dev + - sudo apt-get install -y libhdf5-mpich2-dev # Install GNU m4: - apt-get install -y m4 From bab282a074a7640708cd148946c776d8226ed159 Mon Sep 17 00:00:00 2001 From: Leif Denby Date: Wed, 16 May 2018 17:28:19 +0100 Subject: [PATCH 07/17] try with apt-get update --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b7e1e931..de03f400 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ os: trusty before_install: + - sudo apt-get update # Install MONC's dependencies - sudo apt-get install -y mpich fftw3-dev # Install MONC's python libraries From 3c8f2d055df1d0608690cc7148eaf02f2c6e24ad Mon Sep 17 00:00:00 2001 From: Leif Denby Date: Wed, 16 May 2018 17:37:09 +0100 Subject: [PATCH 08/17] add missing sudo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index de03f400..bdb1a8fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ before_install: # Install HDF5 compiled for parallel use - sudo apt-get install -y libhdf5-mpich2-dev # Install GNU m4: - - apt-get install -y m4 + - sudo apt-get install -y m4 install: - export NETCDF_C_VERSION=4.4.0 From 6c31b4dac5e94e40978aa00367d2e517319770ad Mon Sep 17 00:00:00 2001 From: Leif Denby Date: Wed, 16 May 2018 18:03:48 +0100 Subject: [PATCH 09/17] try compilation with FCM --- .travis.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index bdb1a8fa..d942ca9f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,13 @@ before_install: install: - export NETCDF_C_VERSION=4.4.0 - export NETCDF_FORTRAN_VERSION=4.4.3 + - export FCM_VERSION=2017.10.0 + # Install FCM (used for compilation) + - wget https://github.com/metomi/fcm/archive/${FCM_VERSION}.tar.gz + - tar -xf ${FCM_VERSION}.tar.gz + - export PATH=`pwd`/fcm-${FCM_VERSION}/bin:$PATH + # try compilation with FCM + - fcm make -f fcm-make/monc-ubuntu-14.04-gnu.cfg # Download: - wget https://github.com/Unidata/netcdf-c/archive/v${NETCDF_C_VERSION}.tar.gz - tar -xf v${NETCDF_C_VERSION}.tar.gz @@ -23,7 +30,7 @@ install: # Configure: - CC=mpicc CPPFLAGS=-I/usr/include/hdf5/mpich LDFLAGS=-L/usr/lib/x86_64-linux-gnu/hdf5/mpich ./configure --enable-parallel-tests --disable-dap --prefix=/usr # Build and install: - - make check + # - make check - sudo make install # change directory to home - cd @@ -39,7 +46,7 @@ install: - ODIR=/usr - CC=mpicc FC=mpif90 F77=mpif77 CPPFLAGS="-I${NCDIR}/include -I${H5DIR}/include/hdf5/mpich -I${ODIR}/include" LDFLAGS="-L${NCDIR}/lib -L${H5DIR}/lib/x86_64-linux-gnu/hdf5/mpich -L${ODIR}/lib" LD_LIBRARY_PATH=${NCDIR}/lib:${H5DIR}/lib:${ODIR}/lib LIBS="-lnetcdf -lhdf5_hl -lhdf5 -lz" ./configure --disable-shared --prefix=${NCDIR} # Build and install: - - make check + # - make check - sudo make install From 992007c8a485276e4694383baaaea2d9d727038b Mon Sep 17 00:00:00 2001 From: Leif Denby Date: Wed, 16 May 2018 18:13:43 +0100 Subject: [PATCH 10/17] compile with FCM --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index d942ca9f..fba8f641 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,12 +17,6 @@ install: - export NETCDF_C_VERSION=4.4.0 - export NETCDF_FORTRAN_VERSION=4.4.3 - export FCM_VERSION=2017.10.0 - # Install FCM (used for compilation) - - wget https://github.com/metomi/fcm/archive/${FCM_VERSION}.tar.gz - - tar -xf ${FCM_VERSION}.tar.gz - - export PATH=`pwd`/fcm-${FCM_VERSION}/bin:$PATH - # try compilation with FCM - - fcm make -f fcm-make/monc-ubuntu-14.04-gnu.cfg # Download: - wget https://github.com/Unidata/netcdf-c/archive/v${NETCDF_C_VERSION}.tar.gz - tar -xf v${NETCDF_C_VERSION}.tar.gz @@ -48,6 +42,12 @@ install: # Build and install: # - make check - sudo make install + # Install FCM (used for compilation) + - wget https://github.com/metomi/fcm/archive/${FCM_VERSION}.tar.gz + - tar -xf ${FCM_VERSION}.tar.gz + - export PATH=`pwd`/fcm-${FCM_VERSION}/bin:$PATH + # Compile MONC with FCM + - fcm make -f fcm-make/monc-ubuntu-14.04-gnu.cfg script: pytest From 07e92703cd39ce81f3abb736c979ac9c8d44f17c Mon Sep 17 00:00:00 2001 From: Leif Denby Date: Wed, 16 May 2018 18:49:56 +0100 Subject: [PATCH 11/17] cd into home before compile --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index fba8f641..e9a732d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,6 +47,7 @@ install: - tar -xf ${FCM_VERSION}.tar.gz - export PATH=`pwd`/fcm-${FCM_VERSION}/bin:$PATH # Compile MONC with FCM + - cd - fcm make -f fcm-make/monc-ubuntu-14.04-gnu.cfg From 1a653abb34a7621234d7444ce853578a5b8d5f60 Mon Sep 17 00:00:00 2001 From: Leif Denby Date: Wed, 16 May 2018 19:12:52 +0100 Subject: [PATCH 12/17] more cd-ing --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index e9a732d4..898b56aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,12 +42,16 @@ install: # Build and install: # - make check - sudo make install + # change directory to home + - cd # Install FCM (used for compilation) - wget https://github.com/metomi/fcm/archive/${FCM_VERSION}.tar.gz - tar -xf ${FCM_VERSION}.tar.gz - export PATH=`pwd`/fcm-${FCM_VERSION}/bin:$PATH # Compile MONC with FCM + # change directory to home - cd + - ls - fcm make -f fcm-make/monc-ubuntu-14.04-gnu.cfg From 4b6b06fe15528c1b0b38a46a230b3901db84e0c8 Mon Sep 17 00:00:00 2001 From: Leif Denby Date: Wed, 16 May 2018 19:43:57 +0100 Subject: [PATCH 13/17] move to travis build dir before compile --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 898b56aa..3a631654 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,8 +49,8 @@ install: - tar -xf ${FCM_VERSION}.tar.gz - export PATH=`pwd`/fcm-${FCM_VERSION}/bin:$PATH # Compile MONC with FCM - # change directory to home - - cd + # change to where Travis has checked out our repository + - cd $TRAVIS_BUILD_DIR - ls - fcm make -f fcm-make/monc-ubuntu-14.04-gnu.cfg From 5576baefbc9f6f7dbd5f3445b2894b30bd06a36d Mon Sep 17 00:00:00 2001 From: Leif Denby Date: Wed, 16 May 2018 21:15:38 +0100 Subject: [PATCH 14/17] run MONC as part of tests --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3a631654..eddc2ecc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,5 +54,7 @@ install: - ls - fcm make -f fcm-make/monc-ubuntu-14.04-gnu.cfg - -script: pytest +script: + - pytest + # run straka test for now to ensure that MONC runs + - mpirun -np 4 build/bin/monc_driver.exe --config=testcases/tank_experiments/straka.mcf From c8585cc4bdabc4e04daecb159d9cf0e74e632922 Mon Sep 17 00:00:00 2001 From: Leif Denby Date: Wed, 16 May 2018 21:26:25 +0100 Subject: [PATCH 15/17] add short straka test for checking MONC runs --- .travis.yml | 2 +- testcases/tank_experiments/straka_short.mcf | 128 ++++++++++++++++++++ 2 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 testcases/tank_experiments/straka_short.mcf diff --git a/.travis.yml b/.travis.yml index eddc2ecc..8aee8729 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,4 +57,4 @@ install: script: - pytest # run straka test for now to ensure that MONC runs - - mpirun -np 4 build/bin/monc_driver.exe --config=testcases/tank_experiments/straka.mcf + - mpirun -np 4 build/bin/monc_driver.exe --config=testcases/tank_experiments/straka_short.mcf diff --git a/testcases/tank_experiments/straka_short.mcf b/testcases/tank_experiments/straka_short.mcf new file mode 100644 index 00000000..c3e29f16 --- /dev/null +++ b/testcases/tank_experiments/straka_short.mcf @@ -0,0 +1,128 @@ +# Global configuration +global_configuration=global_config + +# Override global component defaults +fftsolver_enabled=.true. +iterativesolver_enabled=.false. +pw_advection_enabled=.true. +tvd_advection_enabled=.true. +simplesetup_enabled=.true. +smagorinsky_enabled=.true. +lower_bc_enabled=.true. +setfluxlook_enabled=.true. #This must be set to true if running with lower_bc +viscosity_enabled=.true. +diffusion_enabled=.true. +simplecloud_enabled=.false. +coriolis_enabled=.false. +damping_enabled=.false. +forcing_enabled=.false. +galilean_transformation=.false. # Needs debugging +randomnoise_enabled=.false. +mean_profiles_enabled=.true. #This must be set to true if running with damping +th_advection_enabled=.false. +cfltest_enabled=.false. # Make sure we set a sensible initial timestep +iobridge_enabled=.true. +scalar_diagnostics_enabled=.true. +profile_diagnostics_enabled=.true. + +# Test case source code +tank_experiments_enabled=.true. + +# Add bubble to initialisation +initialisation_stage_ordering+=tank_experiments +dynamics_group_contents=kidtestcase, pw_advection, tvd_advection, th_advection, diffusion, viscosity, coriolis, buoyancy, damping, forcing, set_consistent_lowbc, tank_experiments, lwrad_exponential, simplecloud, casim,diverr, psrce, flux_budget, diagnostics, profile_diagnostics, scalar_diagnostics, stepfields + +# IO server configuration +ioserver_configuration_file="io/io_cfg_files/data_write_1file.xml" +moncs_per_io_server=3 +sampling_frequency=4 +3d_sampling_frequency=1 +mm=5.0 +mm1=5.0 +diag_write_freq=10.0 + +#Advection +advection_flow_fields=tvd +advection_theta_field=tvd +advection_q_fields=tvd + +# Control configuration +display_synopsis_frequency=100 +cfl_frequency=2 +termination_time=50. +dtm=.25 + +# Checkpoint configuration +checkpoint_frequency=0 +checkpoint_file="straka_dump.nc" +checkpoint_walltime_frequency=10 +walltime_limit=00:30:00 + +# iterative solver +tolerance=1.e-5 +max_iterations=500 +preconditioner_iterations=0 +include_top_level=.false. +symm_prob=.false. + +# CFL configuration +cfl_frequency=10 +cfl_cvismax=0.2 +cfl_cvelmax=0.2 +cfl_dtmmax=30. +cfl_dtmmin=0.001 + +# Simple setup configuration +thref0=300.0 +surface_pressure=100000. +surface_reference_pressure=100000. +x_size=2 +y_size=512 +z_size=65 +dxx=100 +dyy=100 +zztop=6400.0 +kgd=1,65 +hgd=0.0, 6400.0 +rmlmax=50. + +enable_theta=.true. +number_q_fields=0 +use_anelastic_equations=.true. +origional_vertical_grid_setup=.true. +passive_th=.false. +passive_q=.true. +backscatter=.false. +use_viscosity_and_diffusion=.true. +use_surface_fluxes=.false. +use_time_varying_surface_values=.false. + +# Initialization of fields +l_init_pl_theta=.true. +z_init_pl_theta=0.0, 6400. +f_init_pl_theta=300., 300. +l_init_pl_u=.false. +l_init_pl_v=.false. +l_init_pl_q=.false. + +l_matchthref=.false. + +# Set up the tank + +l_bubbles=.true. +l_splittank=.false. +l_sources=.false. +l_bubble_straka=.true. + +bubble_x_cen=0.0 +bubble_y_cen=25600.0 +bubble_z_cen=3000.0 +bubble_x_rad=6000000.0 +bubble_y_rad=4000.0 +bubble_z_rad=2000.0 +l_bubble_use_t=.true. +#bubble_th_pert=-0.01 +bubble_t_pert=-15. +bubble_edge=0.0 +bubble_lrandom=.false. +bubble_lmoist=.false. From f29b13500b4393124609633ac6d4c441137d49a9 Mon Sep 17 00:00:00 2001 From: Leif Denby Date: Wed, 16 May 2018 22:01:23 +0100 Subject: [PATCH 16/17] second try short straka test case --- {testcases/tank_experiments => tests}/straka_short.mcf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename {testcases/tank_experiments => tests}/straka_short.mcf (97%) diff --git a/testcases/tank_experiments/straka_short.mcf b/tests/straka_short.mcf similarity index 97% rename from testcases/tank_experiments/straka_short.mcf rename to tests/straka_short.mcf index c3e29f16..ad38de59 100644 --- a/testcases/tank_experiments/straka_short.mcf +++ b/tests/straka_short.mcf @@ -36,10 +36,10 @@ dynamics_group_contents=kidtestcase, pw_advection, tvd_advection, th_advection, ioserver_configuration_file="io/io_cfg_files/data_write_1file.xml" moncs_per_io_server=3 sampling_frequency=4 -3d_sampling_frequency=1 +3d_sampling_frequency=20 mm=5.0 mm1=5.0 -diag_write_freq=10.0 +diag_write_freq=900.0 #Advection advection_flow_fields=tvd @@ -49,7 +49,7 @@ advection_q_fields=tvd # Control configuration display_synopsis_frequency=100 cfl_frequency=2 -termination_time=50. +termination_time=100. dtm=.25 # Checkpoint configuration From dd1b88aa4b5d6e3b29af4465b63bb9da4d276800 Mon Sep 17 00:00:00 2001 From: Leif Denby Date: Thu, 17 May 2018 09:50:29 +0100 Subject: [PATCH 17/17] commit travis changes --- .travis.yml | 2 +- .travis.yml.swp | Bin 12288 -> 0 bytes 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 .travis.yml.swp diff --git a/.travis.yml b/.travis.yml index 8aee8729..5df60dec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,4 +57,4 @@ install: script: - pytest # run straka test for now to ensure that MONC runs - - mpirun -np 4 build/bin/monc_driver.exe --config=testcases/tank_experiments/straka_short.mcf + - mpirun -np 4 build/bin/monc_driver.exe --config=tests/straka_short.mcf diff --git a/.travis.yml.swp b/.travis.yml.swp deleted file mode 100644 index 11b72bfd7e07dded0ca673e1dd1a390ecfde3110..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI%yH3L}6b4`y35kV^fE_~zSe&*LRA6Q5P?%s~K~Cbd7LIMjZczs=55oiT8cgs2 z3^*bM2^E%3MZcvZ>-chX@@JJA6NV~vph=KEFW?r`aa6C!w_lC<3TdpIFj zt99IIN6I8zr6%W6Pq}jcS+LQUo)y9x*T{`d8j&yfNV;g8t0|YT1OW)lE->^NJ6a~~ z{Z_LqR^QpC8|xRd*F^;gKmY;|fB*y_009UkaL|G$O&ImAN8Hr2VVJhYXATM