Some fixes so can run on izumi #391

ekluzek · 2023-05-28T22:38:34Z

Some fixes so will compile and run on izumi, with nag compiler. Fix several small issues. Get the list of input files working. Have the PIO decomp free only done after the file is freed. Get ERP and ERI tests to work.

Fixes #277
Fixes #275
Fixes #266
Fixes #270
Fixes #276
Fixes #397
Fixes #399
Fixes #259
Fixes #406
Fixes #411

…hat has already been deallocated in the previous statement 'deallocate(previous)'

…zumi

route/build/src/init_model_data.f90

route/build/src/mpi_utils.f90

route/build/src/water_balance.f90

…rom CTSM rather than mizuroute, add dataset files so that mizroute.input_data_list is set

…e imported

…ons and pgi not on the machine, remove izumi_nag non-DEBUG tests as they don't build in CTSM

…de to run fixing ESCOMP#399, also make sure FileStatus is explicitly initialized to FALSE, and use fileOpen method explicitly in historyFile.f90

…t might have a memory leak

…zumi Conflicts: route/build/cpl/RtmTimeManager.F90 route/build/src/mpi_utils.f90

…zumi Conflicts: route/build/cpl/RtmTimeManager.F90

…fixfornagonizumi

…zumi Conflicts: route/build/src/mpi_utils.f90

…zumi Conflicts: route/build/src/kwt_route.f90

… this allows it to compile on izumi with nag compiler

…riptor

…mment the PIO free decomp calls

…fixfornagonizumi

nmizukami

One comment is about pio_freedecomp input argument

route/build/src/write_simoutput_pio.f90

route/build/src/write_restart_pio.f90

route/build/src/pio_utils.f90

… history file is updated, this should only happen when the restart files are updated

nmizukami · 2023-07-13T20:55:59Z

I don't think i have any other comments so if this works as expected. I could merge it.

ekluzek · 2023-07-13T23:12:56Z

I'm not quite ready yet. I'm having trouble with ERI tests which currently fail, so I'm trying to figure out why and see if I can fix it. The files it expects to compare just aren't there for mizuRoute. I'll let you know when I have that working and have replicated running the test suite on cheyenne and izumi.

…startup start and current time will be the same, for branch and hybrid you need current time rather than start, and for continue you always need current time

…n't work

ekluzek · 2023-07-19T04:04:57Z

OK, this is ready to be merged.

ekluzek · 2023-07-19T04:17:52Z

The tests on cheyenne and izumi are all working as expected.

Izumi:


================================================================================
These tests passed
================================================================================
PET_Mmpi-serial_P1x25.5x5_amazon_r05.I2000Clm50SpMizGs.izumi_intel.mizuroute-default
SMS_D.5x5_amazon_r05.I2000Clm50SpMizGs.izumi_intel.mizuroute-default
SMS_D.5x5_amazon_r05.I2000Clm50SpMizGs.izumi_nag.mizuroute-default
SMS_D_Mmpi-serial.5x5_amazon_r05.I2000Clm50SpMizGs.izumi_gnu.mizuroute-default
SMS_D_Mmpi-serial.5x5_amazon_r05.I2000Clm50SpMizGs.izumi_intel.mizuroute-default
SMS_D_Mmpi-serial.5x5_amazon_r05.I2000Clm50SpMizGs.izumi_nag.mizuroute-default
================================================================================
================================================================================
These tests failed
================================================================================
ERI_Mmpi-serial.5x5_amazon_r05.I2000Clm50SpMizGs.izumi_gnu.mizuroute-default     COMPARE_base_hybrid COMPARE_base_rest EXPECTED
ERS_D_Mmpi-serial.5x5_amazon_r05.I2000Clm50SpMizGs.izumi_nag.mizuroute-default    COMPARE_base_rest             EXPECTED

cheyenne:

================================================================================
These tests passed
================================================================================
ERI.nldas2_nldas2_rHDMA_mnldas2.I2000Clm50SpMizGs.cheyenne_intel.mizuroute-default
ERI_PS.f19_f19_rHDMAlk_mg17.I2000Clm50SpMizGs.cheyenne_gnu.mizuroute-default
ERS.f09_f09_mg17.I2000Clm50SpMizGs.cheyenne_intel.mizuroute-default
ERS_PS.f19_f19_mg17.I2000Clm50SpMizGs.cheyenne_gnu.mizuroute-default
ERS_PS.f19_f19_mg17.I2000Clm50SpMizGs.cheyenne_intel.mizuroute-default
ERS_PS.f19_f19_rHDMAlk_mg17.I2000Clm50SpMizGs.cheyenne_gnu.mizuroute-default
ERS_PS.f19_f19_rHDMAlk_mg17.I2000Clm50SpMizGs.cheyenne_intel.mizuroute-default
ERS_PS.nldas2_nldas2_rHDMA_mnldas2.I2000Clm50SpMizGs.cheyenne_gnu.mizuroute-default
ERS_PS.nldas2_nldas2_rHDMA_mnldas2.I2000Clm50SpMizGs.cheyenne_intel.mizuroute-default
ERS_PS.nldas2_nldas2_rUSGS_mnldas2.I2000Clm50SpMizGs.cheyenne_gnu.mizuroute-default
ERS_PS.nldas2_nldas2_rUSGS_mnldas2.I2000Clm50SpMizGs.cheyenne_intel.mizuroute-default
PET_Mmpi-serial_P1x25.5x5_amazon_r05.I2000Clm50SpMizGs.cheyenne_gnu.mizuroute-default
PET_Mmpi-serial_P1x25.5x5_amazon_r05.I2000Clm50SpMizGs.cheyenne_intel.mizuroute-default
PET_P215x8.nldas2_nldas2_rHDMA_mnldas2.I2000Clm50SpMizGs.cheyenne_gnu.mizuroute-default
PET_P215x8.nldas2_nldas2_rHDMA_mnldas2.I2000Clm50SpMizGs.cheyenne_intel.mizuroute-default
PFS.f19_f19_rHDMA_mg17.I2000Clm50SpMizGs.cheyenne_gnu.mizuroute-default
PFS.f19_f19_rHDMA_mg17.I2000Clm50SpMizGs.cheyenne_intel.mizuroute-default
SMS.f09_f09_rHDMAlk_mg17.I2000Clm50SpMizGs.cheyenne_gnu.mizuroute-default
SMS.f09_f09_rMERIT_mg17.I2000Clm50SpMizGs.cheyenne_gnu.mizuroute-MERIT
SMS.f19_f19_rMERIT_mg17.I2000Clm50SpMizGs.cheyenne_gnu.mizuroute-MERIT
SMS.f19_f19_rMERIT_mg17.I2000Clm50SpMizGs.cheyenne_intel.mizuroute-MERIT
SMS_D.5x5_amazon_r05.I2000Clm50SpMizGs.cheyenne_gnu.mizuroute-default
SMS_D.5x5_amazon_r05.I2000Clm50SpMizGs.cheyenne_intel.mizuroute-default
SMS_D.nldas2_nldas2_rUSGS_mnldas2.I2000Clm50SpMizGs.cheyenne_intel.mizuroute-default
SMS_D_Mmpi-serial.5x5_amazon_r05.I2000Clm50SpMizGs.cheyenne_gnu.mizuroute-default
SMS_D_Mmpi-serial.5x5_amazon_r05.I2000Clm50SpMizGs.cheyenne_intel.mizuroute-default
SMS_Mmpi-serial_D_P1x25.5x5_amazon_r05.I2000Clm50SpMizGs.cheyenne_gnu.mizuroute-default
SMS_Mmpi-serial_D_P1x25.5x5_amazon_r05.I2000Clm50SpMizGs.cheyenne_intel.mizuroute-default
SMS_P720x4.nldas2_nldas2_rMERIT_mnldas2.I2000Clm50SpMizGs.cheyenne_gnu.mizuroute-default
SMS_P720x4.nldas2_nldas2_rMERIT_mnldas2.I2000Clm50SpMizGs.cheyenne_intel.mizuroute-default
SMS_P80x18.f19_f19_rMERIT_mg17.I2000Clm50SpMizGs.cheyenne_intel.mizuroute-MERIT
SMS_PS.hcru_hcru_mt13.I2000Clm50SpMizGs.cheyenne_intel.mizuroute-hcru
SMS_PS.hcru_hcru_rHDMAlk_mt13.I2000Clm50SpMizGs.cheyenne_intel.mizuroute-hcru
================================================================================
================================================================================
These tests failed
================================================================================
ERI_Mmpi-serial.5x5_amazon_r05.I2000Clm50SpMizGs.cheyenne_intel.mizuroute-default         COMPARE_base_hybrid COMPARE_base_rest        EXPECTED
ERP_D_Mmpi-serial_P1x25.5x5_amazon_r05.I2000Clm50SpMizGs.cheyenne_intel.mizuroute-default         COMPARE_base_rest             EXPECTED
ERS_D_Mmpi-serial.5x5_amazon_r05.I2000Clm50SpMizGs.cheyenne_intel.mizuroute-default       COMPARE_base_rest             EXPECTED
ERS_D_Mmpi-serial_P1x25.5x5_amazon_r05.I2000Clm50SpMizGs.cheyenne_intel.mizuroute-default         COMPARE_base_rest             EXPECTED
SMS_D.5x5_amazon_rHDMA.I2000Clm50SpMizGs.cheyenne_intel.mizuroute-5x5_amazon_rHDMA        RUN           EXPECTED

nmizukami · 2023-07-19T18:01:27Z

Hi Erik (@ekluzek),
I closed all the issues mentioned in the comments, but wonder if these issues can be also closed?

#283
#344
#386
#388 (this may be still open to discussion)
#404

ekluzek added 3 commits May 27, 2023 23:16

Changes to get to compile with nag compiler on izumi

b19219a

More system calls for nag compiler

a66d4be

Nag compiler on izumi has trouble with associated statement on list t…

c102d44

…hat has already been deallocated in the previous statement 'deallocate(previous)'

ekluzek added enhancement Improving usability, performance or other types of enhancements WIP [DO NOT MERGE] Working in Progress - not ready to merge yet cesm-coupling For cesm coupling labels May 28, 2023

ekluzek changed the base branch from main to cesm-coupling May 28, 2023 22:39

Merge remote-tracking branch 'escomp/cesm-coupling' into fixfornagoni…

50ea376

…zumi

ekluzek commented May 29, 2023

View reviewed changes

route/build/src/init_model_data.f90 Outdated Show resolved Hide resolved

ekluzek commented May 29, 2023

View reviewed changes

route/build/src/mpi_utils.f90 Outdated Show resolved Hide resolved

ekluzek commented May 29, 2023

View reviewed changes

route/build/src/water_balance.f90 Outdated Show resolved Hide resolved

This was linked to issues Jun 1, 2023

Add list of files needed to be read in to mizuroute.input_data_list #266

Closed

A blank line in the user_ctl_mizuroute file gives a hard to decipher error #270

Closed

Change use of "isnan" to cime share code shr_infnan_isnan #276

Closed

ekluzek added 5 commits June 2, 2023 23:41

Update buildnml for later cime, and have the buildnml test use cime f…

566bcfb

…rom CTSM rather than mizuroute, add dataset files so that mizroute.input_data_list is set

Update dataset to one that's actually CDF5 so can save it to it can b…

9f3e9d6

…e imported

Remove nvhpc on izumi because not available in older ccs_config versi…

c063cd8

…ons and pgi not on the machine, remove izumi_nag non-DEBUG tests as they don't build in CTSM

Correct names of namelists, make sure order is correct

bdf4d46

Do not do the swap if the index is the same -- fixing ESCOMP#397

4addd32

This was linked to issues Jun 5, 2023

NAG compiler complains when swap function is called on identical inputs #397

Closed

PIO free decomp should not be done each time the file is closed... #399

Closed

ekluzek added 9 commits June 4, 2023 22:22

Comment out freeDecomp calls when files are closed this allows the co…

a4f8bad

…de to run fixing ESCOMP#399, also make sure FileStatus is explicitly initialized to FALSE, and use fileOpen method explicitly in historyFile.f90

Remove the freeDecomp calls for restart, this allows it to run, but i…

90b6c13

…t might have a memory leak

Turn mpi-serial on for 1 MPI task tests

e73a99d

Fix typo

f032e37

Do cleanup after closing the file

ae9af5a

Merge remote-tracking branch 'escomp/cesm-coupling' into fixfornagoni…

08a2fd3

…zumi Conflicts: route/build/cpl/RtmTimeManager.F90 route/build/src/mpi_utils.f90

Merge remote-tracking branch 'escomp/cesm-coupling' into fixfornagoni…

1dbfed8

…zumi Conflicts: route/build/cpl/RtmTimeManager.F90

Merge branch 'fixfornagonizumi' of github.com:ekluzek/mizuRoute into …

7cb9f31

…fixfornagonizumi

Merge remote-tracking branch 'escomp/cesm-coupling' into fixfornagoni…

011a646

…zumi Conflicts: route/build/src/mpi_utils.f90

ekluzek added 13 commits July 10, 2023 16:52

Flush and write to iulog rather than 6 or *

46cab0b

Remove some variables not being used

680273b

Remove commented out line

28d3d68

Merge remote-tracking branch 'escomp/cesm-coupling' into fixfornagoni…

60be9ae

…zumi Conflicts: route/build/src/kwt_route.f90

Reverse order of type definitions so one used first is defined first,…

c2f38af

… this allows it to compile on izumi with nag compiler

Have PIO free decomp use the PIO System rather than the PIO file desc…

ecfc3e4

…riptor

Move file close for restart to before free PIO decomp calls, and unco…

e01af9f

…mment the PIO free decomp calls

Increase filename size from 199 to 300

b5c3623

Fix expected fail

3181ea9

Merge branch 'fixfornagonizumi' of github.com:ekluzek/mizuRoute into …

5a16e21

…fixfornagonizumi

Merge branch 'fixfornagonizumi' of github.com:ekluzek/mizuRoute into …

ef39001

…fixfornagonizumi

Change file string length to a parameter

8e175b5

Remove some of the character options known to NOT work

507aace

nmizukami reviewed Jul 13, 2023

View reviewed changes

route/build/src/write_simoutput_pio.f90 Outdated Show resolved Hide resolved

route/build/src/write_restart_pio.f90 Show resolved Hide resolved

route/build/src/pio_utils.f90 Show resolved Hide resolved

Fully remove the bit about updating the restart pointer file when the…

dd6bfb3

… history file is updated, this should only happen when the restart files are updated

ekluzek added 6 commits July 18, 2023 13:57

Always start simulations at current time, this fixes ESCOMP#391, for …

c5780d3

…startup start and current time will be the same, for branch and hybrid you need current time rather than start, and for continue you always need current time

Add some more ERI tests

befdfa6

Add to expected fails

b671342

Add expected fail

18ea762

Change ERI test on izumi to gnu compiler since nag without DEBUG does…

a582644

…n't work

Add an expected fail for izumi_gnu for ERI

030479e

nmizukami merged commit 55da196 into ESCOMP:cesm-coupling Jul 19, 2023

This was referenced Jul 19, 2023

Update path to cime Tools in buildnml/buildlib #283

Closed

MPI_ADDREDUCE needs to have a different receive buffer than send buffer #404

Closed

ekluzek deleted the fixfornagonizumi branch July 19, 2023 19:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Some fixes so can run on izumi #391

Some fixes so can run on izumi #391

ekluzek commented May 28, 2023 •

edited

Loading

nmizukami left a comment

nmizukami commented Jul 13, 2023

ekluzek commented Jul 13, 2023

ekluzek commented Jul 19, 2023

ekluzek commented Jul 19, 2023 •

edited

Loading

nmizukami commented Jul 19, 2023

Some fixes so can run on izumi #391

Some fixes so can run on izumi #391

Conversation

ekluzek commented May 28, 2023 • edited Loading

nmizukami left a comment

Choose a reason for hiding this comment

nmizukami commented Jul 13, 2023

ekluzek commented Jul 13, 2023

ekluzek commented Jul 19, 2023

ekluzek commented Jul 19, 2023 • edited Loading

nmizukami commented Jul 19, 2023

ekluzek commented May 28, 2023 •

edited

Loading

ekluzek commented Jul 19, 2023 •

edited

Loading