diff --git a/README.md b/README.md index 317be886e5..34bf54dd89 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,7 @@ -[![Build Status](https://travis-ci.org/mom-ocean/MOM5.svg?branch=master)](https://travis-ci.org/mom-ocean/MOM5) +| Compile | Model run (fast) | Bit Repro (fast) | + |:-------:|:--------:|:--------:|:--------:| +| [![Build Status](https://travis-ci.org/mom-ocean/MOM5.svg?branch=master)](https://travis-ci.org/mom-ocean/MOM5) | [![Fast model run](https://accessdev.nci.org.au/jenkins/buildStatus/icon?job=mom-ocean.org/MOM5_run)](https://accessdev.nci.org.au/jenkins/buildStatus/icon?job=mom-ocean.org/MOM5_run) | [![Bit Reproducibility](https://accessdev.nci.org.au/jenkins/buildStatus/icon?job=mom-ocean.org/MOM5_bit_reproducibility)](https://accessdev.nci.org.au/jenkins/buildStatus/icon?job=mom-ocean.org/MOM5_bit_reproducibility) | + # The Modular Ocean Model diff --git a/bin/mkmf.template.nci b/bin/mkmf.template.nci index 880aadb5aa..da9cbf88d9 100644 --- a/bin/mkmf.template.nci +++ b/bin/mkmf.template.nci @@ -20,7 +20,7 @@ CC := mpicc VERBOSE := OPT := on -MAKEFLAGS += --jobs=4 +MAKEFLAGS += -j INCLUDE := -I$(NETCDF_ROOT)/include @@ -38,13 +38,15 @@ endif FPPFLAGS := -fpp -Wp,-w $(INCLUDE) FFLAGS := -fno-alias -safe-cray-ptr -fpe0 -ftz -assume byterecl -i4 -r8 -traceback -nowarn -check noarg_temp_created -assume nobuffered_io -convert big_endian -grecord-gcc-switches -align all -FFLAGS_OPT := -g3 -O2 -axCORE-AVX2 -debug all -check none -qopt-report=5 -qopt-report-annotate +FFLAGS_OPT := -g3 -O2 -xCORE-AVX2 -debug all -check none +FFLAGS_REPORT := -qopt-report=5 -qopt-report-annotate FFLAGS_DEBUG := -g3 -O0 -debug all -check -check noarg_temp_created -check nopointer -warn -warn noerrors -ftrapuv FFLAGS_REPRO := -fp-model precise -fp-model source -align all FFLAGS_VERBOSE := -v -V -what CFLAGS := -D__IFC $(INCLUDE) -CFLAGS_OPT := -O2 -debug minimal -axCORE-AVX2 -qopt-report=5 -qopt-report-annotate +CFLAGS_OPT := -O2 -debug minimal -xCORE-AVX2 +CFLAGS_REPORT := -qopt-report=5 -qopt-report-annotate CFLAGS_DEBUG := -O0 -g -ftrapuv -traceback CFLAGS_REPRO := -fp-model precise -fp-model source @@ -70,6 +72,11 @@ FFLAGS += $(FFLAGS_VERBOSE) LDFLAGS += $(LDFLAGS_VERBOSE) endif +ifneq ($(REPORT),) +CFLAGS += $(CFLAGS_REPORT) +FFLAGS += $(FFLAGS_REPORT) +endif + LIBS := -L$(NETCDF_ROOT)/lib -lnetcdf -lnetcdff \ ifneq ($(OASIS_ROOT),) diff --git a/data/data_sources.csv b/data/data_sources.csv index ffc39c1273..ae6134f603 100644 --- a/data/data_sources.csv +++ b/data/data_sources.csv @@ -1,36 +1,36 @@ -CM2.1p1.input.tar.gz, /g/data1/ua8/mom/test_data/CM2.1p1.input.tar.gz, file:///g/data1/ua8/mom/test_data/CM2.1p1.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/CM2.1p1.input.tar.gz -CM2.1p1.output.tar.gz, /g/data1/ua8/mom/test_data/CM2.1p1.output.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/CM2.1p1.output.tar.gz -CM2M_coarse_BLING.input.tar.gz, /g/data1/ua8/mom/test_data/CM2M_coarse_BLING.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/CM2M_coarse_BLING.input.tar.gz -CM2M_coarse_BLING.output.tar.gz, /g/data1/ua8/mom/test_data/CM2M_coarse_BLING.output.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/CM2M_coarse_BLING.output.tar.gz -ESM2M_pi-control_C2.input.tar.gz, /g/data1/ua8/mom/test_data/4dc08e007b6920911634f766da7d36c6--ESM2M_pi-control_C2.input.tar.gz, https://s3-us-west-2.amazonaws.com/mom5/4dc08e007b6920911634f766da7d36c6--ESM2M_pi-control_C2.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/4dc08e007b6920911634f766da7d36c6--ESM2M_pi-control_C2.input.tar.gz -ICCMp1.input.tar.gz, /g/data1/ua8/mom/test_data/ICCMp1.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/ICCMp1.input.tar.gz -MOM5_SIS_COBALT.input.tar.gz, /g/data1/ua8/mom/test_data/MOM5_SIS_COBALT.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/MOM5_SIS_COBALT.input.tar.gz -MOM_SIS_BLING.input.tar.gz, /g/data1/ua8/mom/test_data/MOM_SIS_BLING.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/MOM_SIS_BLING.input.tar.gz -MOM_SIS_BLING.output.tar.gz, /g/data1/ua8/mom/test_data/MOM_SIS_BLING.output.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/MOM_SIS_BLING.output.tar.gz -MOM_SIS_TOPAZ.input.tar.gz, /g/data1/ua8/mom/test_data/MOM_SIS_TOPAZ.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/MOM_SIS_TOPAZ.input.tar.gz -atlantic1.input.tar.gz, /g/data1/ua8/mom/test_data/atlantic1.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/atlantic1.input.tar.gz -baltic1.input.tar.gz, /g/data1/ua8/mom/test_data/baltic1.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/baltic1.input.tar.gz -baltic1_withMask.input.tar.gz, /g/data1/ua8/mom/test_data/baltic1_withMask.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/baltic1_withMask.input.tar.gz -bowl1.input.tar.gz, /g/data1/ua8/mom/test_data/bowl1.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/bowl1.input.tar.gz -bowl1.output.tar.gz, /g/data1/ua8/mom/test_data/bowl1.output.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/bowl1.output.tar.gz -box1.input.tar.gz, /g/data1/ua8/mom/test_data/box1.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/box1.input.tar.gz -box1.output.tar.gz, /g/data1/ua8/mom/test_data/box1.output.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/box1.output.tar.gz -box_channel1.input.tar.gz, /g/data1/ua8/mom/test_data/box_channel1.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/box_channel1.input.tar.gz -box_channel1.output.tar.gz, /g/data1/ua8/mom/test_data/box_channel1.output.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/box_channel1.output.tar.gz -dome1.input.tar.gz, /g/data1/ua8/mom/test_data/dome1.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/dome1.input.tar.gz -dome1.output.tar.gz, /g/data1/ua8/mom/test_data/dome1.output.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/dome1.output.tar.gz -dome_bates_blobs_mosaics.input.tar.gz, /g/data1/ua8/mom/test_data/dome_bates_blobs_mosaics.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/dome_bates_blobs_mosaics.input.tar.gz -global_0.25_degree_NYF.input.tar.gz, /g/data1/ua8/mom/test_data/global_0.25_degree_NYF.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/global_0.25_degree_NYF.input.tar.gz -gyre1.input.tar.gz, /g/data1/ua8/mom/test_data/gyre1.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/gyre1.input.tar.gz -gyre1.output.tar.gz, /g/data1/ua8/mom/test_data/gyre1.output.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/gyre1.output.tar.gz -iom1.input.tar.gz, /g/data1/ua8/mom/test_data/iom1.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/iom1.input.tar.gz -iom1.output.tar.gz, /g/data1/ua8/mom/test_data/iom1.output.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/iom1.output.tar.gz -mk3p51.input.tar.gz, /g/data1/ua8/mom/test_data/mk3p51.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/mk3p51.input.tar.gz -mk3p51.output.tar.gz, /g/data1/ua8/mom/test_data/mk3p51.output.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/mk3p51.output.tar.gz -mom4p1_ebm1.input.tar.gz, /g/data1/ua8/mom/test_data/521e418ac4988e8a424903ed4d219339--mom4p1_ebm1.input.tar.gz, https://s3-us-west-2.amazonaws.com/mom5/521e418ac4988e8a424903ed4d219339--mom4p1_ebm1.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/521e418ac4988e8a424903ed4d219339--mom4p1_ebm1.tar.gz -om3_core1.input.tar.gz, /g/data1/ua8/mom/test_data/om3_core1.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/om3_core1.input.tar.gz -om3_core3.input.tar.gz, /g/data1/ua8/mom/test_data/om3_core3.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/om3_core3.input.tar.gz -symmetric_box1.input.tar.gz, /g/data1/ua8/mom/test_data/symmetric_box1.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/symmetric_box1.input.tar.gz -symmetric_box1.output.tar.gz, /g/data1/ua8/mom/test_data/symmetric_box1.output.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/symmetric_box1.output.tar.gz -torus1.input.tar.gz, /g/data1/ua8/mom/test_data/torus1.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/torus1.input.tar.gz -torus1.output.tar.gz, /g/data1/ua8/mom/test_data/torus1.output.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/torus1.output.tar.gz +CM2.1p1.input.tar.gz, /g/data/ua8/mom/test_data/CM2.1p1.input.tar.gz, file:///g/data1/ua8/mom/test_data/CM2.1p1.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/CM2.1p1.input.tar.gz +CM2.1p1.output.tar.gz, /g/data/ua8/mom/test_data/CM2.1p1.output.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/CM2.1p1.output.tar.gz +CM2M_coarse_BLING.input.tar.gz, /g/data/ua8/mom/test_data/CM2M_coarse_BLING.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/CM2M_coarse_BLING.input.tar.gz +CM2M_coarse_BLING.output.tar.gz, /g/data/ua8/mom/test_data/CM2M_coarse_BLING.output.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/CM2M_coarse_BLING.output.tar.gz +ESM2M_pi-control_C2.input.tar.gz, /g/data/ua8/mom/test_data/ESM2M_pi-control_C2.input.tar.gz, https://s3-us-west-2.amazonaws.com/mom5/4dc08e007b6920911634f766da7d36c6--ESM2M_pi-control_C2.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/4dc08e007b6920911634f766da7d36c6--ESM2M_pi-control_C2.input.tar.gz +ICCMp1.input.tar.gz, /g/data/ua8/mom/test_data/ICCMp1.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/ICCMp1.input.tar.gz +MOM5_SIS_COBALT.input.tar.gz, /g/data/ua8/mom/test_data/MOM5_SIS_COBALT.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/MOM5_SIS_COBALT.input.tar.gz +MOM_SIS_BLING.input.tar.gz, /g/data/ua8/mom/test_data/MOM_SIS_BLING.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/MOM_SIS_BLING.input.tar.gz +MOM_SIS_BLING.output.tar.gz, /g/data/ua8/mom/test_data/MOM_SIS_BLING.output.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/MOM_SIS_BLING.output.tar.gz +MOM_SIS_TOPAZ.input.tar.gz, /g/data/ua8/mom/test_data/MOM_SIS_TOPAZ.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/MOM_SIS_TOPAZ.input.tar.gz +atlantic1.input.tar.gz, /g/data/ua8/mom/test_data/atlantic1.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/atlantic1.input.tar.gz +baltic1.input.tar.gz, /g/data/ua8/mom/test_data/baltic1.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/baltic1.input.tar.gz +baltic1_withMask.input.tar.gz, /g/data/ua8/mom/test_data/baltic1_withMask.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/baltic1_withMask.input.tar.gz +bowl1.input.tar.gz, /g/data/ua8/mom/test_data/bowl1.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/bowl1.input.tar.gz +bowl1.output.tar.gz, /g/data/ua8/mom/test_data/bowl1.output.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/bowl1.output.tar.gz +box1.input.tar.gz, /g/data/ua8/mom/test_data/box1.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/box1.input.tar.gz +box1.output.tar.gz, /g/data/ua8/mom/test_data/box1.output.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/box1.output.tar.gz +box_channel1.input.tar.gz, /g/data/ua8/mom/test_data/box_channel1.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/box_channel1.input.tar.gz +box_channel1.output.tar.gz, /g/data/ua8/mom/test_data/box_channel1.output.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/box_channel1.output.tar.gz +dome1.input.tar.gz, /g/data/ua8/mom/test_data/dome1.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/dome1.input.tar.gz +dome1.output.tar.gz, /g/data/ua8/mom/test_data/dome1.output.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/dome1.output.tar.gz +dome_bates_blobs_mosaics.input.tar.gz, /g/data/ua8/mom/test_data/dome_bates_blobs_mosaics.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/dome_bates_blobs_mosaics.input.tar.gz +global_0.25_degree_NYF.input.tar.gz, /g/data/ua8/mom/test_data/global_0.25_degree_NYF.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/global_0.25_degree_NYF.input.tar.gz +gyre1.input.tar.gz, /g/data/ua8/mom/test_data/gyre1.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/gyre1.input.tar.gz +gyre1.output.tar.gz, /g/data/ua8/mom/test_data/gyre1.output.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/gyre1.output.tar.gz +iom1.input.tar.gz, /g/data/ua8/mom/test_data/iom1.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/iom1.input.tar.gz +iom1.output.tar.gz, /g/data/ua8/mom/test_data/iom1.output.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/iom1.output.tar.gz +mk3p51.input.tar.gz, /g/data/ua8/mom/test_data/mk3p51.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/mk3p51.input.tar.gz +mk3p51.output.tar.gz, /g/data/ua8/mom/test_data/mk3p51.output.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/mk3p51.output.tar.gz +mom4p1_ebm1.input.tar.gz, /g/data/ua8/mom/test_data/521e418ac4988e8a424903ed4d219339--mom4p1_ebm1.input.tar.gz, https://s3-us-west-2.amazonaws.com/mom5/521e418ac4988e8a424903ed4d219339--mom4p1_ebm1.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/521e418ac4988e8a424903ed4d219339--mom4p1_ebm1.tar.gz +om3_core1.input.tar.gz, /g/data/ua8/mom/test_data/om3_core1.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/om3_core1.input.tar.gz +om3_core3.input.tar.gz, /g/data/ua8/mom/test_data/om3_core3.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/om3_core3.input.tar.gz +symmetric_box1.input.tar.gz, /g/data/ua8/mom/test_data/symmetric_box1.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/symmetric_box1.input.tar.gz +symmetric_box1.output.tar.gz, /g/data/ua8/mom/test_data/symmetric_box1.output.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/symmetric_box1.output.tar.gz +torus1.input.tar.gz, /g/data/ua8/mom/test_data/torus1.input.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/torus1.input.tar.gz +torus1.output.tar.gz, /g/data/ua8/mom/test_data/torus1.output.tar.gz, http://portal.sf.utas.edu.au/thredds/fileServer/momtest/test_data/torus1.output.tar.gz diff --git a/test/__init__.py b/test/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/test/checksums/global_0.25_degree_NYF.txt b/test/checksums/global_0.25_degree_NYF.txt index 319afe1513..5804397cd6 100644 --- a/test/checksums/global_0.25_degree_NYF.txt +++ b/test/checksums/global_0.25_degree_NYF.txt @@ -35,84 +35,84 @@ [chksum] Meridional velocity -7249498313810813572 [chksum] Advection of u 0 [chksum] Advection of v 0 -[chksum] rho(taup1) -5228655765806158873 -[chksum] pressure_at_depth -2602006771179050609 -[chksum] denominator_r 2693985434781652859 +[chksum] rho(taup1) -5228655765806049149 +[chksum] pressure_at_depth -2602006771144361481 +[chksum] denominator_r 2693985434781371689 [chksum] drhodT 0 [chksum] drhodS 0 -[chksum] drhodz_zt -4990143966100677696 -[chksum] temp -4528823927010038362 -[chksum] salt 6263093784330460868 -[chksum] age_global 3779460750759608651 -[chksum] con_temp -4528823927010038362 -[chksum] frazil 1126211935080857386 -[chksum] ending bih_viscosity -3771569078923306400 -[chksum] Zonal velocity -8849599669647864949 -[chksum] Meridional velocity 543843899939445192 -[chksum] Advection of u 5954657255218742934 -[chksum] Advection of v -1252416647680338094 -[chksum] eta_t 8150698494461073763 -[chksum] eta_u 8025225857656952376 -[chksum] deta_dt -2912609222815033299 -[chksum] eta_t_bar -3859239782582598798 -[chksum] pbot_t 3409291348587532748 -[chksum] pbot_u -1184624555096754254 +[chksum] drhodz_zt -4990143966096942736 +[chksum] temp 4685543933238892986 +[chksum] salt 6263081408821077684 +[chksum] age_global 3732231883791001245 +[chksum] con_temp 4685543933238892986 +[chksum] frazil -3005765170537017064 +[chksum] ending bih_viscosity -3763625859079809285 +[chksum] Zonal velocity -8354611749859822394 +[chksum] Meridional velocity 233987655894885771 +[chksum] Advection of u 5850302193490625342 +[chksum] Advection of v -852796555062052421 +[chksum] eta_t -1078562889199173104 +[chksum] eta_u -1191092013016004602 +[chksum] deta_dt -3014415690206107256 +[chksum] eta_t_bar 5388856979380953361 +[chksum] pbot_t 3409289676846100827 +[chksum] pbot_u -1184625206027402374 [chksum] dpbot_dt 0 -[chksum] anompb 8737657829416025728 +[chksum] anompb 8737811156084161161 [chksum] anompb_bar 0 -[chksum] patm_t -1118620825631263959 -[chksum] dpatm_dt 2099493703973195121 -[chksum] ps -1712684285521478532 -[chksum] grad_ps_1 -7648255929903342337 -[chksum] grad_ps_2 4756717306660085297 +[chksum] patm_t -1120931756742379115 +[chksum] dpatm_dt 2064680257290903992 +[chksum] ps -1733493654020116290 +[chksum] grad_ps_1 1465965984065897748 +[chksum] grad_ps_2 -4575431137438879307 [chksum] grad_anompb_1 0 [chksum] grad_anompb_2 0 -[chksum] udrho -4763557975247632 -[chksum] vdrho 5453771711450671274 -[chksum] conv_rho_ud_t -7036769778803498554 -[chksum] source 3485895577749609498 -[chksum] eta smoother 3485895577749609498 +[chksum] udrho -170257896684598875 +[chksum] vdrho -3781717086273300153 +[chksum] conv_rho_ud_t 2268787642834460069 +[chksum] source -6088814926945644036 +[chksum] eta smoother -6088814926945644036 [chksum] pbot smoother 0 [chksum] eta_nonbouss 0 -[chksum] forcing_u_bt -2535054483210019989 -[chksum] forcing_v_bt -5920657477986097252 -[chksum] Thickness%rho_dzt(taup1) -1873953358087761973 -[chksum] Thickness%rho_dzu(taup1) 3057417132698457125 -[chksum] Thickness%mass_u(taup1) 1524739892868286576 -[chksum] Thickness%rho_dzten(1) 3296436274548088712 -[chksum] Thickness%rho_dzten(2) 343669714666435226 -[chksum] Thickness%rho_dztr -8256795262996782509 -[chksum] Thickness%rho_dzur -6226098132440267504 -[chksum] Thickness%rho_dzt_tendency -7498558635582850830 -[chksum] Thickness%dzt 5676438204680240247 -[chksum] Thickness%dzten(1) -6033539024652791275 -[chksum] Thickness%dzten(2) -9030340870746377831 -[chksum] Thickness%dztlo 3942553466827337488 -[chksum] Thickness%dztup 1393533194545492931 -[chksum] Thickness%dzt_dst 7785717768996376356 -[chksum] Thickness%dzwt(k=0) -6169987691987237323 -[chksum] Thickness%dzwt(k=1:nk) 6232411310498940963 -[chksum] Thickness%dzu -6489800747210464482 -[chksum] Thickness%dzwu(k=0) 4693364414902479774 -[chksum] Thickness%dzwu(k=1:nk) 7776568608098420956 -[chksum] Thickness%depth_zt 1074248730776925746 -[chksum] Thickness%geodepth_zt -1598983845504712779 -[chksum] Thickness%depth_zu 8685271604689884678 -[chksum] Thickness%depth_zwt -2259504960590366562 -[chksum] Thickness%depth_zwu 1533570269860121900 -[chksum] Thickness%depth_st 5775532497423710340 +[chksum] forcing_u_bt -2565697506984317816 +[chksum] forcing_v_bt -5796446264107613006 +[chksum] Thickness%rho_dzt(taup1) -1873930992897086469 +[chksum] Thickness%rho_dzu(taup1) 3057433547597200193 +[chksum] Thickness%mass_u(taup1) 1524737401359493739 +[chksum] Thickness%rho_dzten(1) 3296456051361078241 +[chksum] Thickness%rho_dzten(2) 343683136404722691 +[chksum] Thickness%rho_dztr -8256816564148232310 +[chksum] Thickness%rho_dzur -6226111589621156116 +[chksum] Thickness%rho_dzt_tendency -8825301541315019016 +[chksum] Thickness%dzt 5676460304879599396 +[chksum] Thickness%dzten(1) -6033519491831941882 +[chksum] Thickness%dzten(2) -9030327623507399262 +[chksum] Thickness%dztlo 3942575857426695134 +[chksum] Thickness%dztup 1393555149168739329 +[chksum] Thickness%dzt_dst 7785745329267728069 +[chksum] Thickness%dzwt(k=0) -6169988126620941289 +[chksum] Thickness%dzwt(k=1:nk) 6232433901196450724 +[chksum] Thickness%dzu -6489784531216848581 +[chksum] Thickness%dzwu(k=0) 4693362061173302442 +[chksum] Thickness%dzwu(k=1:nk) 7776585296539698185 +[chksum] Thickness%depth_zt 1074270544382788642 +[chksum] Thickness%geodepth_zt -1599107319709022338 +[chksum] Thickness%depth_zu 8685286283643626588 +[chksum] Thickness%depth_zwt -2259483660265557230 +[chksum] Thickness%depth_zwu 1533584608956667564 +[chksum] Thickness%depth_st 5775532497423691607 [chksum] Thickness%depth_swt 2368064006192834427 [chksum] Thickness%dst 8654216964153938812 -[chksum] Thickness%dstlo 7043254513298094536 -[chksum] Thickness%dstup 4187022715153906320 +[chksum] Thickness%dstlo 7043254513298304976 +[chksum] Thickness%dstup 4187022715153695496 [chksum] Thickness%dswt(k=0) -3872842410685890560 -[chksum] Thickness%dswt(k=1:nk) -9144430188666644476 -[chksum] Thickness%pbot0 5714512700831699749 -[chksum] Thickness%mass_en(1) -8452981472842868360 -[chksum] Thickness%mass_en(2) -6973256189512522261 -[chksum] rho(taup1) -6308297439066623858 -[chksum] pressure_at_depth 1566152950847323390 -[chksum] denominator_r 2828394390018834336 -[chksum] drhodT 4600603740374082904 -[chksum] drhodS -1517805477271572158 -[chksum] drhodz_zt -8685775940031880166 +[chksum] Thickness%dswt(k=1:nk) -9144430188666537876 +[chksum] Thickness%pbot0 5714512700831708121 +[chksum] Thickness%mass_en(1) -8452982940855107426 +[chksum] Thickness%mass_en(2) -6973259196884848193 +[chksum] rho(taup1) -6308297848676762540 +[chksum] pressure_at_depth 1566044782187347257 +[chksum] denominator_r 2828413442596445935 +[chksum] drhodT -4646137383656932035 +[chksum] drhodS -1517797820926843541 +[chksum] drhodz_zt 1002022552967756738 diff --git a/test/checksums/om3_core3.txt b/test/checksums/om3_core3.txt index f0ed347cb8..d7704c7975 100644 --- a/test/checksums/om3_core3.txt +++ b/test/checksums/om3_core3.txt @@ -35,105 +35,105 @@ [chksum] Meridional velocity -6082379532961051272 [chksum] Advection of u 0 [chksum] Advection of v 0 -[chksum] rho(taup1) -9199008382265721423 -[chksum] pressure_at_depth -4439427739172762469 -[chksum] denominator_r -3040263033207550582 +[chksum] rho(taup1) -9199008382265716684 +[chksum] pressure_at_depth -4439427739170716649 +[chksum] denominator_r -3040263033207560152 [chksum] drhodT 0 [chksum] drhodS 0 -[chksum] drhodz_zt 2778077585614203903 -[chksum] temp 2394865222818446573 -[chksum] salt -98484558129617199 -[chksum] age_global 1195727138493889668 -[chksum] residency_kppbl_irr_14d 2338514438650100068 -[chksum] residency_age_surface 1388720600027708365 -[chksum] residency_age_surface_inv -5164575956980569207 -[chksum] residency_age_bottom 931078657874774514 -[chksum] residency_age_bottom_inv -2180577323012421430 -[chksum] residency_kppbl_nil 500798271607040076 -[chksum] residency_kppbl_14d -7496028633506814817 -[chksum] residency_kppbl_frc -7926004808940844857 -[chksum] residency_temp_15_20 8736057834752068453 -[chksum] cfc_11 -6727817715990239817 -[chksum] cfc_12 -6263744689579942209 -[chksum] dic_abiotic -4675762788423715855 -[chksum] di14c_abiotic -299391279950065263 -[chksum] con_temp 5646859950033851447 -[chksum] frazil 5650586901916749147 -[chksum] ending agm_array -2465658163947670673 -[chksum] ending aredi_array -2465658163947670673 -[chksum] ending rossby_radius 3994445754401805984 -[chksum] ending rossby_radius_raw -7135155393578943779 +[chksum] drhodz_zt 2778077585614185309 +[chksum] temp 2426735196263334019 +[chksum] salt -98484577754137331 +[chksum] age_global 1199850307104566305 +[chksum] residency_kppbl_irr_14d -6940096392164821577 +[chksum] residency_age_surface 1392778888085730287 +[chksum] residency_age_surface_inv -5168181675256930314 +[chksum] residency_age_bottom 931078512162921217 +[chksum] residency_age_bottom_inv -2180577104823112471 +[chksum] residency_kppbl_nil 6069066654798925293 +[chksum] residency_kppbl_14d -2139642178399847896 +[chksum] residency_kppbl_frc -8279285860249435705 +[chksum] residency_temp_15_20 8736057788640802051 +[chksum] cfc_11 -6790359719126249793 +[chksum] cfc_12 2787268589486490006 +[chksum] dic_abiotic 4285321057082592623 +[chksum] di14c_abiotic 8660891292804504245 +[chksum] con_temp 5658265416622911534 +[chksum] frazil 5650751305466210553 +[chksum] ending agm_array -2467150556994460048 +[chksum] ending aredi_array -2467150556994460048 +[chksum] ending rossby_radius 3994445755731202240 +[chksum] ending rossby_radius_raw -7134640258767895105 [chksum] ending bczone_radius 0 -[chksum] surf_turb_thick 8434504811619668951 -[chksum] surf_trans_thick -3437926147301071402 -[chksum] ending bih_viscosity -3523866880850936956 +[chksum] surf_turb_thick 8434513059716299673 +[chksum] surf_trans_thick -3437934859359682761 +[chksum] ending bih_viscosity -3523867156318806370 [chksum] thickness_sigma 1591740993298759680 -[chksum] Zonal velocity -409092264416942435 -[chksum] Meridional velocity 3003862942531944728 -[chksum] Advection of u 8822762435592928577 -[chksum] Advection of v -9190529329173636850 -[chksum] eta_t 624526255469859078 -[chksum] eta_u 4314468336454705597 +[chksum] Zonal velocity -435548307364028723 +[chksum] Meridional velocity -6217126011228464932 +[chksum] Advection of u 8831434625764342103 +[chksum] Advection of v -9079244019513060840 +[chksum] eta_t 624567622705010260 +[chksum] eta_u 4314446288864142420 [chksum] deta_dt 0 [chksum] eta_t_bar 0 -[chksum] pbot_t -4575142682264910966 -[chksum] pbot_u 7753273014961644166 -[chksum] dpbot_dt 9087015001353604204 -[chksum] anompb -6243437699173876243 -[chksum] anompb_bar 3139735431766195965 -[chksum] patm_t -6396775284184056075 -[chksum] dpatm_dt 2833117139245008614 -[chksum] ps -6396775284184056075 -[chksum] grad_ps_1 -6479550743615296982 -[chksum] grad_ps_2 -651738908643637479 -[chksum] grad_anompb_1 1407032725740036078 -[chksum] grad_anompb_2 -4925256578325871957 -[chksum] udrho 3207532249458093673 -[chksum] vdrho 7983110873578934362 -[chksum] conv_rho_ud_t 7094387113768219205 -[chksum] source 2603460960670502423 +[chksum] pbot_t -4575142598759386955 +[chksum] pbot_u 7753273108226472853 +[chksum] dpbot_dt 9089184978002128198 +[chksum] anompb -6243462605519882052 +[chksum] anompb_bar 3139726914748260013 +[chksum] patm_t -6396715127331240106 +[chksum] dpatm_dt 2833275679000900433 +[chksum] ps -6396715127331240106 +[chksum] grad_ps_1 -6479654379857642947 +[chksum] grad_ps_2 -651520435616682567 +[chksum] grad_anompb_1 1407966407256961935 +[chksum] grad_anompb_2 -4926037613569928164 +[chksum] udrho 3216752908461540573 +[chksum] vdrho 7978347873114363110 +[chksum] conv_rho_ud_t 7090360034292402915 +[chksum] source 2602075810520101986 [chksum] eta smoother 0 -[chksum] pbot smoother -7392575049891976839 -[chksum] eta_nonbouss 621529793670290954 -[chksum] forcing_u_bt -9129503593234979000 -[chksum] forcing_v_bt 4386363107054864258 -[chksum] Thickness%rho_dzt(taup1) -2129825777096886083 -[chksum] Thickness%rho_dzu(taup1) 2882322550116017772 -[chksum] Thickness%mass_u(taup1) 8285273924219699389 -[chksum] Thickness%rho_dzten(1) -8582148061311378324 -[chksum] Thickness%rho_dzten(2) -3029468250877820885 -[chksum] Thickness%rho_dztr -33862627571745401 -[chksum] Thickness%rho_dzur -6306910497185987549 -[chksum] Thickness%rho_dzt_tendency 5473575387635270181 -[chksum] Thickness%dzt -2859679085820941832 -[chksum] Thickness%dzten(1) 7914729676958462882 -[chksum] Thickness%dzten(2) -5079915585853872363 -[chksum] Thickness%dztlo -4702051321263468857 -[chksum] Thickness%dztup -3366414115455404344 -[chksum] Thickness%dzt_dst 2915734657079198700 -[chksum] Thickness%dzwt(k=0) -7858483483933028436 -[chksum] Thickness%dzwt(k=1:nk) 7672798553861627945 -[chksum] Thickness%dzu 4145842542880148394 -[chksum] Thickness%dzwu(k=0) -5842992928226439413 -[chksum] Thickness%dzwu(k=1:nk) 1195936347022766275 -[chksum] Thickness%depth_zt 7540290698268369533 -[chksum] Thickness%geodepth_zt 3139836489195913443 -[chksum] Thickness%depth_zu 5541890375247302892 -[chksum] Thickness%depth_zwt -9001504572912358926 -[chksum] Thickness%depth_zwu -2883476847012226712 -[chksum] Thickness%depth_st 5639671071283866082 -[chksum] Thickness%depth_swt -6196991240489679587 -[chksum] Thickness%dst -5175348028150229377 -[chksum] Thickness%dstlo -9136563880805504365 -[chksum] Thickness%dstup 7185163362923758797 +[chksum] pbot smoother -7394006048149907149 +[chksum] eta_nonbouss 621571194201512192 +[chksum] forcing_u_bt -9129758084497916872 +[chksum] forcing_v_bt 4386163067790734992 +[chksum] Thickness%rho_dzt(taup1) -2129824341438190890 +[chksum] Thickness%rho_dzu(taup1) 2882323980581515929 +[chksum] Thickness%mass_u(taup1) 8285273995639160306 +[chksum] Thickness%rho_dzten(1) -8582146627441467369 +[chksum] Thickness%rho_dzten(2) -3029466781371110001 +[chksum] Thickness%rho_dztr -33864434980560496 +[chksum] Thickness%rho_dzur -6306912299344581134 +[chksum] Thickness%rho_dzt_tendency 5622072312947883576 +[chksum] Thickness%dzt -2859677654297432505 +[chksum] Thickness%dzten(1) 7914731102900627237 +[chksum] Thickness%dzten(2) -5079914099752101978 +[chksum] Thickness%dztlo -4702049879604047093 +[chksum] Thickness%dztup -3366412673623511411 +[chksum] Thickness%dzt_dst 2915736500114125798 +[chksum] Thickness%dzwt(k=0) -7858483423466061593 +[chksum] Thickness%dzwt(k=1:nk) 7672800000907032404 +[chksum] Thickness%dzu 4145843989759954015 +[chksum] Thickness%dzwu(k=0) -5842992879383004326 +[chksum] Thickness%dzwu(k=1:nk) 1195937820882213165 +[chksum] Thickness%depth_zt 7540292302448563231 +[chksum] Thickness%geodepth_zt 3139825198356946153 +[chksum] Thickness%depth_zu 5541892021562606567 +[chksum] Thickness%depth_zwt -9001502970020930235 +[chksum] Thickness%depth_zwu -2883475204092650415 +[chksum] Thickness%depth_st 5639671071283866242 +[chksum] Thickness%depth_swt -6196991240489680092 +[chksum] Thickness%dst -5175348028150213612 +[chksum] Thickness%dstlo -9136563880805557653 +[chksum] Thickness%dstup 7185163362923767865 [chksum] Thickness%dswt(k=0) -6994388566914629632 -[chksum] Thickness%dswt(k=1:nk) 3522257758696889556 -[chksum] Thickness%pbot0 -4515701684460617810 -[chksum] Thickness%mass_en(1) -6548310655217100083 -[chksum] Thickness%mass_en(2) -6288111759697588549 -[chksum] rho(taup1) -9200744421576702550 -[chksum] pressure_at_depth -7171043017692794444 -[chksum] denominator_r -3333158624630077287 -[chksum] drhodT 7048219188757761488 -[chksum] drhodS 4143461651260587585 -[chksum] drhodz_zt 2111169326680770716 +[chksum] Thickness%dswt(k=1:nk) 3522257758696838908 +[chksum] Thickness%pbot0 -4515701684460618315 +[chksum] Thickness%mass_en(1) -6548310582625942045 +[chksum] Thickness%mass_en(2) -6288111666364832206 +[chksum] rho(taup1) -9200744426453058418 +[chksum] pressure_at_depth -7171041927674872568 +[chksum] denominator_r -3333158830749196499 +[chksum] drhodT 7047707220300873550 +[chksum] drhodS 4143461592709339534 +[chksum] drhodz_zt -7159217197255081492 diff --git a/test/model_test_setup.py b/test/model_test_setup.py index 17d7365f73..e09891c759 100644 --- a/test/model_test_setup.py +++ b/test/model_test_setup.py @@ -10,6 +10,30 @@ import time import platform as plat +run_scripts = {} + +run_scripts['nci'] = \ +"""#!/bin/csh -f + +#PBS -P x77 +#PBS -q normal +#PBS -l walltime={walltime} +#PBS -l ncpus={ncpus} +#PBS -l mem={mem} +#PBS -l wd +#PBS -l storage=scratch/v45+scratch/x77 +#PBS -o {stdout_file} +#PBS -e {stderr_file} +#PBS -N {run_name} +#PBS -W block=true + +limit stacksize unlimited + +./MOM_run.csh --platform nci --type {type} --experiment {exp} {npes} {valgrind} +""" + +build_cmd_template = " ./MOM_compile.csh --platform {platform} --type {type} {unit_testing}" + class ModelTestSetup(object): def __init__(self): @@ -35,6 +59,7 @@ def download_input_data(self, exp): if not os.path.exists(input): cmd = '{} {}'.format(os.path.join(self.data_dir, 'get_exp_data.py'), filename) + print(cmd) ret = sp.call(shlex.split(cmd)) if ret != 0: return ret @@ -49,6 +74,7 @@ def download_input_data(self, exp): if not os.path.exists(os.path.join(self.work_dir, exp)): cmd = '/bin/tar -C {} -xvf {}'.format(self.work_dir, input) + print(cmd) ret += sp.call(shlex.split(cmd)) return ret @@ -63,8 +89,8 @@ def get_qsub_output(self, fo, fe): stderr = '' stdout = '' while True: - so = os.read(fo, 1024*1024) - se = os.read(fe, 1024*1024) + so = os.read(fo, 1024*1024).decode(encoding='ASCII') + se = os.read(fe, 1024*1024).decode(encoding='ASCII') if so == '' and se == '': empty_reads += 1 @@ -125,11 +151,11 @@ def run(self, model_type, exp, walltime='01:00:00', ncpus='32', valgrind ='' # Get temporary file names for the stdout, stderr. - fo, stdout_file = tempfile.mkstemp(dir=self.exp_dir) - fe, stderr_file = tempfile.mkstemp(dir=self.exp_dir) + fo, stdout_file = tempfile.mkstemp(dir=self.exp_dir, text=True) + fe, stderr_file = tempfile.mkstemp(dir=self.exp_dir, text=True) # Write script out as a file. - run_script = plat.run_scripts[self.get_platform()] + run_script = run_scripts[self.get_platform()] run_script = run_script.format(walltime=walltime, ncpus=ncpus, mem=mem, stdout_file=stdout_file, stderr_file=stderr_file, @@ -137,9 +163,11 @@ def run(self, model_type, exp, walltime='01:00:00', ncpus='32', type=model_type, exp=exp, npes=npes, valgrind=valgrind) + print(self.exp_dir) + print(run_script) # Write out run script - frun, run_file = tempfile.mkstemp(dir=self.exp_dir) - os.write(frun, run_script) + frun, run_file = tempfile.mkstemp(dir=self.exp_dir, text=True) + os.write(frun, run_script.encode()) os.close(frun) os.chmod(run_file, 0o755) @@ -152,13 +180,16 @@ def run(self, model_type, exp, walltime='01:00:00', ncpus='32', stdout, stderr = self.get_qsub_output(fo, fe) else: try: - stdout = sp.check_output([run_file], stderr=sp.STDOUT) + stdout = sp.check_output([run_file], stderr=sp.STDOUT, text=True) except sp.CalledProcessError as e: ret = e.returncode stdout = e.output - os.write(fo, stdout) - os.write(fe, stderr) + os.write(fo, stdout.encode()) + os.write(fe, stderr.encode()) + + os.close(fo) + os.close(fe) # Move temporary files to experiment directory. shutil.move(stdout_file, os.path.join(self.work_dir, exp, 'fms.out')) @@ -173,6 +204,8 @@ def run(self, model_type, exp, walltime='01:00:00', ncpus='32', def build(self, model_type, unit_testing=True): + global build_cmd_template + os.chdir(self.exp_dir) if unit_testing: @@ -181,8 +214,8 @@ def build(self, model_type, unit_testing=True): unit_testing ='' platform = self.get_platform() - build_cmd = plat.build_cmd.format(type=model_type, platform=platform, - unit_testing=unit_testing) + build_cmd = build_cmd_template.format(type=model_type, platform=platform, + unit_testing=unit_testing) # Build the model. ret = sp.call(shlex.split(build_cmd)) diff --git a/test/platform.py b/test/platform.py index 0b75131ce5..666431b7a1 100644 --- a/test/platform.py +++ b/test/platform.py @@ -8,6 +8,7 @@ #PBS -l ncpus={ncpus} #PBS -l mem={mem} #PBS -l wd +#PBS -l storage=scratch/v45+scratch/x77 #PBS -o {stdout_file} #PBS -e {stderr_file} #PBS -N {run_name} diff --git a/test/qsub_tests.sh b/test/qsub_tests.sh new file mode 100755 index 0000000000..7ca64378d5 --- /dev/null +++ b/test/qsub_tests.sh @@ -0,0 +1,15 @@ +#PBS -P v45 +#PBS -l ncpus=960 +#PBS -l mem=1920Gb +#PBS -l walltime=5:00:00 +#PBS -l wd +#PBS -l storage=gdata/hh5 +#PBS -W block=true + +module purge + +module use /g/data3/hh5/public/modules +module load conda/analysis3-unstable +module load pbs + +nosetests --with-xunit test_run.py -s diff --git a/test/test_bit_reproducibility.py b/test/test_bit_reproducibility.py index 6ef9028911..9370ca636c 100644 --- a/test/test_bit_reproducibility.py +++ b/test/test_bit_reproducibility.py @@ -53,7 +53,7 @@ def check_run(self, key): produced = self.produced_checksums(key) for k in expected: - assert(produced.has_key(k)) + assert(k in produced) if expected[k] != produced[k]: print('{}: expected {}, produced {}'.format(key, expected[k], produced[k])) diff --git a/test/test_run.py b/test/test_run.py index 8ee0cd3d9f..1cb02b4eb9 100644 --- a/test/test_run.py +++ b/test/test_run.py @@ -14,17 +14,19 @@ # If you want the test harness to submit a job to run the test, then type: # $ python -c "import test_run ; tc = test_run.TestRun() ; test_run.TestRun.check_run(tc, 'om3_core3', qsub=True)" -tests = {'om3_core3' : (('MOM_SIS', 'om3_core3'), {'ncpus' : '32', 'npes' : '24'}), - 'om3_core1' : (('MOM_SIS', 'om3_core1'), {'ncpus' : '32', 'npes' : '24'}), - 'atlantic1' : (('MOM_SIS', 'atlantic1'), {'ncpus' : '32', 'npes' : '24', 'mem' : '64Gb'}), - 'mom4p1_ebm1' : (('EBM', 'mom4p1_ebm1'), {'ncpus' : '32', 'npes' : '17', 'mem' : '64Gb'}), - 'MOM_SIS_TOPAZ' : (('MOM_SIS', 'MOM_SIS_TOPAZ'), {'ncpus' : '32', 'npes' : '24', 'walltime' : '02:00:00'}), - 'MOM_SIS_BLING' : (('MOM_SIS', 'MOM_SIS_BLING'), {'ncpus' : '32', 'npes' : '24'}), - 'CM2.1p1' : (('CM2M', 'CM2.1p1'), {'ncpus' : '64', 'npes' : '45', 'mem' : '128Gb'}), - 'CM2M_coarse_BLING' : (('CM2M', 'CM2M_coarse_BLING'), {'ncpus' : '64', 'npes' : '45', 'mem' : '128Gb'}), - 'ICCMp1' : (('ICCM', 'ICCMp1'), {'ncpus' : '64', 'npes' : '54', 'mem' : '128Gb'}), - 'ESM2M_pi-control_C2' : (('ESM2M', 'ESM2M_pi-control_C2'), {'ncpus' : '128', 'npes' : '90', 'mem' : '256Gb'}), - 'global_0.25_degree_NYF' : (('MOM_SIS', 'global_0.25_degree_NYF'), {'ncpus' : '960', 'npes' : '960', 'mem' : '1900Gb'})} +tests = { + 'om3_core3' : (('MOM_SIS', 'om3_core3'), {'ncpus' : '32', 'npes' : '24'}), + # 'om3_core1' : (('MOM_SIS', 'om3_core1'), {'ncpus' : '32', 'npes' : '24'}), + # 'atlantic1' : (('MOM_SIS', 'atlantic1'), {'ncpus' : '32', 'npes' : '24', 'mem' : '64Gb'}), + # 'mom4p1_ebm1' : (('EBM', 'mom4p1_ebm1'), {'ncpus' : '32', 'npes' : '17', 'mem' : '64Gb'}), + # 'MOM_SIS_TOPAZ' : (('MOM_SIS', 'MOM_SIS_TOPAZ'), {'ncpus' : '32', 'npes' : '24', 'walltime' : '02:00:00'}), + # 'MOM_SIS_BLING' : (('MOM_SIS', 'MOM_SIS_BLING'), {'ncpus' : '32', 'npes' : '24'}), + # 'CM2.1p1' : (('CM2M', 'CM2.1p1'), {'ncpus' : '64', 'npes' : '45', 'mem' : '128Gb'}), + # 'CM2M_coarse_BLING' : (('CM2M', 'CM2M_coarse_BLING'), {'ncpus' : '64', 'npes' : '45', 'mem' : '128Gb'}), + # 'ICCMp1' : (('ICCM', 'ICCMp1'), {'ncpus' : '64', 'npes' : '54', 'mem' : '128Gb'}), + # 'ESM2M_pi-control_C2' : (('ESM2M', 'ESM2M_pi-control_C2'), {'ncpus' : '128', 'npes' : '90', 'mem' : '256Gb'}), + 'global_0.25_degree_NYF' : (('MOM_SIS', 'global_0.25_degree_NYF'), {'ncpus' : '960', 'npes' : '960', 'mem' : '1900Gb'}) + } class TestRun(ModelTestSetup): """ diff --git a/test/test_run_setup.py b/test/test_run_setup.py index 0540b2f5ae..43667d1a35 100644 --- a/test/test_run_setup.py +++ b/test/test_run_setup.py @@ -23,6 +23,7 @@ def check_build(self, model): assert(ret == 0) def check_download_data(self, experiment): + print('Check data downloaded for {}'.format(experiment)) ret = self.download_input_data(experiment) assert(ret == 0)