From 826b684484f718466719eaf0fcd0413ae11ba6a3 Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 20 Dec 2023 09:17:19 -0700 Subject: [PATCH 01/11] update ghactions testing --- .github/workflows/write_logfiles.csh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/write_logfiles.csh b/.github/workflows/write_logfiles.csh index a6777dec6..f43e448a8 100755 --- a/.github/workflows/write_logfiles.csh +++ b/.github/workflows/write_logfiles.csh @@ -4,7 +4,7 @@ foreach logfile (case*/logs/cice.runlog* testsuite.*/*/logs/cice.runlog*) echo "### ${logfile} ###" - tail -20 $logfile + tail -200 $logfile echo " " end From dbbddee47226a14302c95c7992d2be3939531871 Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 20 Dec 2023 10:21:28 -0700 Subject: [PATCH 02/11] update ghactions testing --- .github/workflows/test-cice.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml index b04ca1714..776fd7664 100644 --- a/.github/workflows/test-cice.yml +++ b/.github/workflows/test-cice.yml @@ -26,14 +26,18 @@ jobs: strategy: matrix: # os: [macos-latest, ubuntu-latest] - os: [macos-latest] +# os: [macos-latest] + os: [macos-12.6] # os: [macos-13] # os: [ubuntu-latest] include: # - os: macos-13 # envdef: macos # minicond: Miniconda3-latest-MacOSX-x86_64.sh - - os: macos-latest +# - os: macos-latest +# envdef: macos +# minicond: Miniconda3-latest-MacOSX-x86_64.sh + - os: macos-12.6 envdef: macos minicond: Miniconda3-latest-MacOSX-x86_64.sh # - os: ubuntu-latest From 056479b0e2105ddb724b1c225a8e2eaca293ca3e Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 20 Dec 2023 11:01:18 -0700 Subject: [PATCH 03/11] update ghactions testing --- .github/workflows/test-cice.yml | 10 +++------- cicecore/shared/ice_init_column.F90 | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml index 776fd7664..93abc6fa6 100644 --- a/.github/workflows/test-cice.yml +++ b/.github/workflows/test-cice.yml @@ -26,18 +26,14 @@ jobs: strategy: matrix: # os: [macos-latest, ubuntu-latest] -# os: [macos-latest] - os: [macos-12.6] + os: [macos-latest] # os: [macos-13] # os: [ubuntu-latest] include: # - os: macos-13 # envdef: macos # minicond: Miniconda3-latest-MacOSX-x86_64.sh -# - os: macos-latest -# envdef: macos -# minicond: Miniconda3-latest-MacOSX-x86_64.sh - - os: macos-12.6 + - os: macos-latest envdef: macos minicond: Miniconda3-latest-MacOSX-x86_64.sh # - os: ubuntu-latest @@ -151,7 +147,7 @@ jobs: run: | cd $HOME/cice-dirs/input wget --progress=dot:giga https://zenodo.org/record/3728358/files/CICE_data_gx3_grid_ic-20200320.tar.gz && tar xvfz CICE_data_gx3_grid_ic-20200320.tar.gz - wget --progress=dot:giga https://zenodo.org/record/3728362/files/CICE_data_gx3_forcing_NCAR_bulk-20200320.tar.gz && tar xvfz CICE_data_gx3_forcing_NCAR_bulk-20200320.tar.gz +# wget --progress=dot:giga https://zenodo.org/record/3728362/files/CICE_data_gx3_forcing_NCAR_bulk-20200320.tar.gz && tar xvfz CICE_data_gx3_forcing_NCAR_bulk-20200320.tar.gz wget --progress=dot:giga https://zenodo.org/record/3728364/files/CICE_data_gx3_forcing_JRA55-20200320.tar.gz && tar xvfz CICE_data_gx3_forcing_JRA55-20200320.tar.gz pwd ls -alR diff --git a/cicecore/shared/ice_init_column.F90 b/cicecore/shared/ice_init_column.F90 index 22cd3184a..f2280f0b4 100644 --- a/cicecore/shared/ice_init_column.F90 +++ b/cicecore/shared/ice_init_column.F90 @@ -2218,7 +2218,7 @@ subroutine count_tracers if (my_task == master_task) then call icepack_write_tracer_flags(nu_diag) call icepack_write_tracer_sizes(nu_diag) - call icepack_write_tracer_indices(nu_diag) +!tcx call icepack_write_tracer_indices(nu_diag) endif call icepack_warnings_flush(nu_diag) if (icepack_warnings_aborted()) call abort_ice(error_message=subname//' Icepack Abort3', & From 754f0c83c4bf013e63f642987fdb7a5787dd511b Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 20 Dec 2023 11:04:23 -0700 Subject: [PATCH 04/11] update ghactions testing --- .github/workflows/test-cice.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml index 93abc6fa6..160485d04 100644 --- a/.github/workflows/test-cice.yml +++ b/.github/workflows/test-cice.yml @@ -147,7 +147,6 @@ jobs: run: | cd $HOME/cice-dirs/input wget --progress=dot:giga https://zenodo.org/record/3728358/files/CICE_data_gx3_grid_ic-20200320.tar.gz && tar xvfz CICE_data_gx3_grid_ic-20200320.tar.gz -# wget --progress=dot:giga https://zenodo.org/record/3728362/files/CICE_data_gx3_forcing_NCAR_bulk-20200320.tar.gz && tar xvfz CICE_data_gx3_forcing_NCAR_bulk-20200320.tar.gz wget --progress=dot:giga https://zenodo.org/record/3728364/files/CICE_data_gx3_forcing_JRA55-20200320.tar.gz && tar xvfz CICE_data_gx3_forcing_JRA55-20200320.tar.gz pwd ls -alR From 74423db6401df50c9532f63bb9fe5c8e72c6192c Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 20 Dec 2023 11:29:58 -0700 Subject: [PATCH 05/11] update ghactions testing --- cicecore/shared/ice_init_column.F90 | 2 +- configuration/scripts/machines/Macros.conda_macos | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cicecore/shared/ice_init_column.F90 b/cicecore/shared/ice_init_column.F90 index f2280f0b4..22cd3184a 100644 --- a/cicecore/shared/ice_init_column.F90 +++ b/cicecore/shared/ice_init_column.F90 @@ -2218,7 +2218,7 @@ subroutine count_tracers if (my_task == master_task) then call icepack_write_tracer_flags(nu_diag) call icepack_write_tracer_sizes(nu_diag) -!tcx call icepack_write_tracer_indices(nu_diag) + call icepack_write_tracer_indices(nu_diag) endif call icepack_warnings_flush(nu_diag) if (icepack_warnings_aborted()) call abort_ice(error_message=subname//' Icepack Abort3', & diff --git a/configuration/scripts/machines/Macros.conda_macos b/configuration/scripts/machines/Macros.conda_macos index fad87507c..850173c83 100644 --- a/configuration/scripts/machines/Macros.conda_macos +++ b/configuration/scripts/machines/Macros.conda_macos @@ -14,7 +14,8 @@ FFLAGS := -fconvert=big-endian -fbacktrace -ffree-line-length-none # Additional flags for the Fortran compiler when compiling in debug mode ifeq ($(ICE_BLDDEBUG), true) - FFLAGS += -O0 -g -fcheck=bounds -finit-real=nan -fimplicit-none -ffpe-trap=invalid,zero,overflow +# FFLAGS += -O0 -g -fcheck=bounds -finit-real=nan -fimplicit-none -ffpe-trap=invalid,zero,overflow + FFLAGS += -O0 -g -fcheck=bounds -fimplicit-none -ffpe-trap=invalid,zero,overflow else FFLAGS += -O2 endif From 95d1520155a7fe7cd37e3231188bdc464114d74a Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 20 Dec 2023 12:03:47 -0700 Subject: [PATCH 06/11] update ghactions testing --- configuration/scripts/machines/Macros.conda_macos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration/scripts/machines/Macros.conda_macos b/configuration/scripts/machines/Macros.conda_macos index 850173c83..e222756b5 100644 --- a/configuration/scripts/machines/Macros.conda_macos +++ b/configuration/scripts/machines/Macros.conda_macos @@ -15,7 +15,7 @@ FFLAGS := -fconvert=big-endian -fbacktrace -ffree-line-length-none # Additional flags for the Fortran compiler when compiling in debug mode ifeq ($(ICE_BLDDEBUG), true) # FFLAGS += -O0 -g -fcheck=bounds -finit-real=nan -fimplicit-none -ffpe-trap=invalid,zero,overflow - FFLAGS += -O0 -g -fcheck=bounds -fimplicit-none -ffpe-trap=invalid,zero,overflow + FFLAGS += -O0 -g else FFLAGS += -O2 endif From 530b9557dcb501081288c64759183496a29052c9 Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 20 Dec 2023 12:38:28 -0700 Subject: [PATCH 07/11] update ghactions testing --- .../comm/mpi/ice_global_reductions.F90 | 45 +++++++++++-------- .../comm/serial/ice_global_reductions.F90 | 45 +++++++++++-------- .../scripts/machines/Macros.conda_macos | 2 +- configuration/scripts/tests/gridsys_suite.ts | 6 +-- 4 files changed, 58 insertions(+), 40 deletions(-) diff --git a/cicecore/cicedyn/infrastructure/comm/mpi/ice_global_reductions.F90 b/cicecore/cicedyn/infrastructure/comm/mpi/ice_global_reductions.F90 index 91daf53a8..1f7592749 100644 --- a/cicecore/cicedyn/infrastructure/comm/mpi/ice_global_reductions.F90 +++ b/cicecore/cicedyn/infrastructure/comm/mpi/ice_global_reductions.F90 @@ -40,6 +40,15 @@ module ice_global_reductions global_maxval, & global_minval + real (kind=dbl_kind), parameter :: & + bigdbl = 1.0e36_dbl_kind + + real (kind=real_kind), parameter :: & + bigreal = 1.0e36_real_kind + + real (kind=int_kind), parameter :: & + bigint = 9999999 + !----------------------------------------------------------------------- ! ! generic interfaces for module procedures @@ -1246,8 +1255,8 @@ function global_maxval_dbl (array, dist, lMask) & !----------------------------------------------------------------------- - localMaxval = -HUGE(0.0_dbl_kind) - globalMaxval = -HUGE(0.0_dbl_kind) + localMaxval = -bigdbl + globalMaxval = -bigdbl call ice_distributionGet(dist, & numLocalBlocks = numBlocks, & @@ -1264,7 +1273,7 @@ function global_maxval_dbl (array, dist, lMask) & jb = this_block%jlo je = this_block%jhi - blockMaxval = -HUGE(0.0_dbl_kind) + blockMaxval = -bigdbl if (present(lMask)) then do j=jb,je @@ -1353,8 +1362,8 @@ function global_maxval_real (array, dist, lMask) & !----------------------------------------------------------------------- - localMaxval = -HUGE(0.0_real_kind) - globalMaxval = -HUGE(0.0_real_kind) + localMaxval = -bigreal + globalMaxval = -bigreal call ice_distributionGet(dist, & numLocalBlocks = numBlocks, & @@ -1371,7 +1380,7 @@ function global_maxval_real (array, dist, lMask) & jb = this_block%jlo je = this_block%jhi - blockMaxval = -HUGE(0.0_real_kind) + blockMaxval = -bigreal if (present(lMask)) then do j=jb,je @@ -1460,8 +1469,8 @@ function global_maxval_int (array, dist, lMask) & !----------------------------------------------------------------------- - localMaxval = -HUGE(0_int_kind) - globalMaxval = -HUGE(0_int_kind) + localMaxval = -bigint + globalMaxval = -bigint call ice_distributionGet(dist, & numLocalBlocks = numBlocks, & @@ -1478,7 +1487,7 @@ function global_maxval_int (array, dist, lMask) & jb = this_block%jlo je = this_block%jhi - blockMaxval = -HUGE(0_int_kind) + blockMaxval = -bigint if (present(lMask)) then do j=jb,je @@ -1791,8 +1800,8 @@ function global_minval_dbl (array, dist, lMask) & !----------------------------------------------------------------------- - localMinval = HUGE(0.0_dbl_kind) - globalMinval = HUGE(0.0_dbl_kind) + localMinval = bigdbl + globalMinval = bigdbl call ice_distributionGet(dist, & numLocalBlocks = numBlocks, & @@ -1809,7 +1818,7 @@ function global_minval_dbl (array, dist, lMask) & jb = this_block%jlo je = this_block%jhi - blockMinval = HUGE(0.0_dbl_kind) + blockMinval = bigdbl if (present(lMask)) then do j=jb,je @@ -1898,8 +1907,8 @@ function global_minval_real (array, dist, lMask) & !----------------------------------------------------------------------- - localMinval = HUGE(0.0_real_kind) - globalMinval = HUGE(0.0_real_kind) + localMinval = bigreal + globalMinval = bigreal call ice_distributionGet(dist, & numLocalBlocks = numBlocks, & @@ -1916,7 +1925,7 @@ function global_minval_real (array, dist, lMask) & jb = this_block%jlo je = this_block%jhi - blockMinval = HUGE(0.0_real_kind) + blockMinval = bigreal if (present(lMask)) then do j=jb,je @@ -2005,8 +2014,8 @@ function global_minval_int (array, dist, lMask) & !----------------------------------------------------------------------- - localMinval = HUGE(0_int_kind) - globalMinval = HUGE(0_int_kind) + localMinval = bigint + globalMinval = bigint call ice_distributionGet(dist, & numLocalBlocks = numBlocks, & @@ -2023,7 +2032,7 @@ function global_minval_int (array, dist, lMask) & jb = this_block%jlo je = this_block%jhi - blockMinval = HUGE(0_int_kind) + blockMinval = bigint if (present(lMask)) then do j=jb,je diff --git a/cicecore/cicedyn/infrastructure/comm/serial/ice_global_reductions.F90 b/cicecore/cicedyn/infrastructure/comm/serial/ice_global_reductions.F90 index ed36cc6c0..e4eb95b56 100644 --- a/cicecore/cicedyn/infrastructure/comm/serial/ice_global_reductions.F90 +++ b/cicecore/cicedyn/infrastructure/comm/serial/ice_global_reductions.F90 @@ -41,6 +41,15 @@ module ice_global_reductions global_maxval, & global_minval + real (kind=dbl_kind), parameter :: & + bigdbl = 1.0e36_dbl_kind + + real (kind=real_kind), parameter :: & + bigreal = 1.0e36_real_kind + + real (kind=int_kind), parameter :: & + bigint = 9999999 + !----------------------------------------------------------------------- ! ! generic interfaces for module procedures @@ -1247,8 +1256,8 @@ function global_maxval_dbl (array, dist, lMask) & !----------------------------------------------------------------------- - localMaxval = -HUGE(0.0_dbl_kind) - globalMaxval = -HUGE(0.0_dbl_kind) + localMaxval = -bigdbl + globalMaxval = -bigdbl call ice_distributionGet(dist, & numLocalBlocks = numBlocks, & @@ -1265,7 +1274,7 @@ function global_maxval_dbl (array, dist, lMask) & jb = this_block%jlo je = this_block%jhi - blockMaxval = -HUGE(0.0_dbl_kind) + blockMaxval = -bigdbl if (present(lMask)) then do j=jb,je @@ -1354,8 +1363,8 @@ function global_maxval_real (array, dist, lMask) & !----------------------------------------------------------------------- - localMaxval = -HUGE(0.0_real_kind) - globalMaxval = -HUGE(0.0_real_kind) + localMaxval = -bigreal + globalMaxval = -bigreal call ice_distributionGet(dist, & numLocalBlocks = numBlocks, & @@ -1372,7 +1381,7 @@ function global_maxval_real (array, dist, lMask) & jb = this_block%jlo je = this_block%jhi - blockMaxval = -HUGE(0.0_real_kind) + blockMaxval = -bigreal if (present(lMask)) then do j=jb,je @@ -1461,8 +1470,8 @@ function global_maxval_int (array, dist, lMask) & !----------------------------------------------------------------------- - localMaxval = -HUGE(0_int_kind) - globalMaxval = -HUGE(0_int_kind) + localMaxval = -bigint + globalMaxval = -bigint call ice_distributionGet(dist, & numLocalBlocks = numBlocks, & @@ -1479,7 +1488,7 @@ function global_maxval_int (array, dist, lMask) & jb = this_block%jlo je = this_block%jhi - blockMaxval = -HUGE(0_int_kind) + blockMaxval = -bigint if (present(lMask)) then do j=jb,je @@ -1792,8 +1801,8 @@ function global_minval_dbl (array, dist, lMask) & !----------------------------------------------------------------------- - localMinval = HUGE(0.0_dbl_kind) - globalMinval = HUGE(0.0_dbl_kind) + localMinval = bigdbl + globalMinval = bigdbl call ice_distributionGet(dist, & numLocalBlocks = numBlocks, & @@ -1810,7 +1819,7 @@ function global_minval_dbl (array, dist, lMask) & jb = this_block%jlo je = this_block%jhi - blockMinval = HUGE(0.0_dbl_kind) + blockMinval = bigdbl if (present(lMask)) then do j=jb,je @@ -1899,8 +1908,8 @@ function global_minval_real (array, dist, lMask) & !----------------------------------------------------------------------- - localMinval = HUGE(0.0_real_kind) - globalMinval = HUGE(0.0_real_kind) + localMinval = bigreal + globalMinval = bigreal call ice_distributionGet(dist, & numLocalBlocks = numBlocks, & @@ -1917,7 +1926,7 @@ function global_minval_real (array, dist, lMask) & jb = this_block%jlo je = this_block%jhi - blockMinval = HUGE(0.0_real_kind) + blockMinval = bigreal if (present(lMask)) then do j=jb,je @@ -2006,8 +2015,8 @@ function global_minval_int (array, dist, lMask) & !----------------------------------------------------------------------- - localMinval = HUGE(0_int_kind) - globalMinval = HUGE(0_int_kind) + localMinval = bigint + globalMinval = bigint call ice_distributionGet(dist, & numLocalBlocks = numBlocks, & @@ -2024,7 +2033,7 @@ function global_minval_int (array, dist, lMask) & jb = this_block%jlo je = this_block%jhi - blockMinval = HUGE(0_int_kind) + blockMinval = bigint if (present(lMask)) then do j=jb,je diff --git a/configuration/scripts/machines/Macros.conda_macos b/configuration/scripts/machines/Macros.conda_macos index e222756b5..d10c0c846 100644 --- a/configuration/scripts/machines/Macros.conda_macos +++ b/configuration/scripts/machines/Macros.conda_macos @@ -15,7 +15,7 @@ FFLAGS := -fconvert=big-endian -fbacktrace -ffree-line-length-none # Additional flags for the Fortran compiler when compiling in debug mode ifeq ($(ICE_BLDDEBUG), true) # FFLAGS += -O0 -g -fcheck=bounds -finit-real=nan -fimplicit-none -ffpe-trap=invalid,zero,overflow - FFLAGS += -O0 -g + FFLAGS += -O0 -g -fcheck=bounds -fimplicit-none else FFLAGS += -O2 endif diff --git a/configuration/scripts/tests/gridsys_suite.ts b/configuration/scripts/tests/gridsys_suite.ts index c10465f4b..e2731dd39 100644 --- a/configuration/scripts/tests/gridsys_suite.ts +++ b/configuration/scripts/tests/gridsys_suite.ts @@ -12,7 +12,7 @@ restart gx3 4x2 debug,diag1 restart2 gx1 16x2 debug,diag1 restart tx1 40x2 diag1 smoke gbox12 1x1x12x12x1 boxchan -smoke gbox80 4x2 boxchan1e +smoke gbox80 4x2 boxchan1e,debug smoke gbox80 8x1 boxchan1n smoke gbox80 1x1 box2001 smoke gbox80 2x2 boxwallblock @@ -35,7 +35,7 @@ restart gx3 4x2 debug,diag1,gridcd restart2 gx1 16x2 debug,diag1,gridcd restart tx1 40x2 diag1,gridcd smoke gbox12 1x1x12x12x1 boxchan,gridcd -smoke gbox80 4x2 boxchan1e,gridcd +smoke gbox80 4x2 boxchan1e,debug,gridcd smoke gbox80 8x1 boxchan1n,gridcd smoke gbox80 1x1 box2001,gridcd smoke gbox80 2x2 boxwallblock,gridcd @@ -58,7 +58,7 @@ restart gx3 4x2 debug,diag1,gridc restart2 gx1 16x2 debug,diag1,gridc restart tx1 40x2 diag1,gridc smoke gbox12 1x1x12x12x1 boxchan,gridc -smoke gbox80 4x2 boxchan1e,gridc +smoke gbox80 4x2 boxchan1e,debug,gridc smoke gbox80 8x1 boxchan1n,gridc smoke gbox80 1x1 box2001,gridc smoke gbox80 2x2 boxwallblock,gridc From 90d797190207e00057c0e839a0cf3e369db2d107 Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 20 Dec 2023 13:02:11 -0700 Subject: [PATCH 08/11] update ghactions testing --- .github/workflows/write_logfiles.csh | 2 +- configuration/scripts/machines/Macros.conda_macos | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/write_logfiles.csh b/.github/workflows/write_logfiles.csh index f43e448a8..a6777dec6 100755 --- a/.github/workflows/write_logfiles.csh +++ b/.github/workflows/write_logfiles.csh @@ -4,7 +4,7 @@ foreach logfile (case*/logs/cice.runlog* testsuite.*/*/logs/cice.runlog*) echo "### ${logfile} ###" - tail -200 $logfile + tail -20 $logfile echo " " end diff --git a/configuration/scripts/machines/Macros.conda_macos b/configuration/scripts/machines/Macros.conda_macos index d10c0c846..33dd61155 100644 --- a/configuration/scripts/machines/Macros.conda_macos +++ b/configuration/scripts/machines/Macros.conda_macos @@ -15,7 +15,7 @@ FFLAGS := -fconvert=big-endian -fbacktrace -ffree-line-length-none # Additional flags for the Fortran compiler when compiling in debug mode ifeq ($(ICE_BLDDEBUG), true) # FFLAGS += -O0 -g -fcheck=bounds -finit-real=nan -fimplicit-none -ffpe-trap=invalid,zero,overflow - FFLAGS += -O0 -g -fcheck=bounds -fimplicit-none + FFLAGS += -O0 -g -fcheck=bounds -finit-real=nan -fimplicit-none else FFLAGS += -O2 endif From 793caa239c012ca809a1acdf25748bfde59703e6 Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 20 Dec 2023 13:31:55 -0700 Subject: [PATCH 09/11] update ghactions testing --- configuration/scripts/machines/Macros.conda_macos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration/scripts/machines/Macros.conda_macos b/configuration/scripts/machines/Macros.conda_macos index 33dd61155..d42217ac4 100644 --- a/configuration/scripts/machines/Macros.conda_macos +++ b/configuration/scripts/machines/Macros.conda_macos @@ -15,7 +15,7 @@ FFLAGS := -fconvert=big-endian -fbacktrace -ffree-line-length-none # Additional flags for the Fortran compiler when compiling in debug mode ifeq ($(ICE_BLDDEBUG), true) # FFLAGS += -O0 -g -fcheck=bounds -finit-real=nan -fimplicit-none -ffpe-trap=invalid,zero,overflow - FFLAGS += -O0 -g -fcheck=bounds -finit-real=nan -fimplicit-none + FFLAGS += -O0 -g -fcheck=bounds -finit-real=nan -fimplicit-none -ffpe-trap=invalid,zero else FFLAGS += -O2 endif From 3cf842b62a2f3a9646559b802254a9ad4e6353fd Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 20 Dec 2023 14:00:40 -0700 Subject: [PATCH 10/11] update ghactions testing --- configuration/scripts/machines/Macros.conda_macos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration/scripts/machines/Macros.conda_macos b/configuration/scripts/machines/Macros.conda_macos index d42217ac4..10a876a56 100644 --- a/configuration/scripts/machines/Macros.conda_macos +++ b/configuration/scripts/machines/Macros.conda_macos @@ -15,7 +15,7 @@ FFLAGS := -fconvert=big-endian -fbacktrace -ffree-line-length-none # Additional flags for the Fortran compiler when compiling in debug mode ifeq ($(ICE_BLDDEBUG), true) # FFLAGS += -O0 -g -fcheck=bounds -finit-real=nan -fimplicit-none -ffpe-trap=invalid,zero,overflow - FFLAGS += -O0 -g -fcheck=bounds -finit-real=nan -fimplicit-none -ffpe-trap=invalid,zero + FFLAGS += -O0 -g -fcheck=bounds -finit-real=nan -fimplicit-none -ffpe-trap=zero else FFLAGS += -O2 endif From 28cb2baff01e4338e73be5c07721d2bc99f682e2 Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 20 Dec 2023 14:24:59 -0700 Subject: [PATCH 11/11] update ghactions testing --- configuration/scripts/machines/Macros.conda_macos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration/scripts/machines/Macros.conda_macos b/configuration/scripts/machines/Macros.conda_macos index 10a876a56..191e10d7d 100644 --- a/configuration/scripts/machines/Macros.conda_macos +++ b/configuration/scripts/machines/Macros.conda_macos @@ -15,7 +15,7 @@ FFLAGS := -fconvert=big-endian -fbacktrace -ffree-line-length-none # Additional flags for the Fortran compiler when compiling in debug mode ifeq ($(ICE_BLDDEBUG), true) # FFLAGS += -O0 -g -fcheck=bounds -finit-real=nan -fimplicit-none -ffpe-trap=invalid,zero,overflow - FFLAGS += -O0 -g -fcheck=bounds -finit-real=nan -fimplicit-none -ffpe-trap=zero + FFLAGS += -O0 -g -fcheck=bounds -finit-real=nan -fimplicit-none -ffpe-trap=zero,overflow else FFLAGS += -O2 endif