Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes the default setting for rof_heat #6253

Merged
merged 1 commit into from
Feb 29, 2024

Conversation

bishtgautam
Copy link
Contributor

@bishtgautam bishtgautam commented Feb 22, 2024

The heat model in MOSART is not supported by default. Thus, the
default value of rof_heat is set to .false..

[NML]
[BFB] but removes fields from coupler history.

The heat model in MOSART is not supported by default. Thus, the default
value of `rof_heat` is set to `.false.`.

[NML]
Copy link

PR Preview Action v1.4.7
🚀 Deployed preview to https://E3SM-Project.github.io/E3SM/pr-preview/pr-6253/
on branch gh-pages at 2024-02-22 23:37 UTC

@rljacob rljacob added this to the v3.0.0-rc milestone Feb 23, 2024
@rljacob rljacob added the BFB PR leaves answers BFB label Feb 23, 2024
@rljacob
Copy link
Member

rljacob commented Feb 23, 2024

This is also BFB right? Since it was turned off in MOSART.

@peterdschwartz
Copy link
Contributor

I'm testing this pr on next

@peterdschwartz
Copy link
Contributor

peterdschwartz commented Feb 27, 2024

ERS_D.ne4pg2_oQU480.I20TRELM.chrysalis_intel.elm-disableDynpftCheck FAILs when I merged this to next

  4:  decompInit_lnd(): Number of clumps exceeds number of land grid cells
  4:          256         201
 25:  decompInit_lnd(): Number of clumps exceeds number of land grid cells
 25:          256         201
 25:  ENDRUN:
 25:  ERROR in decompInitMod.F90 at line 183

edit: going through the diffs as well

@rljacob
Copy link
Member

rljacob commented Feb 27, 2024

Did you update submodules? This is a coupler flag and should have no impact outside of it.

@peterdschwartz
Copy link
Contributor

@rljacob I believe I did. git submodule update --init --recursive didn't do any changes after executing it again. I'll clean all and rebuild to be sure

@peterdschwartz
Copy link
Contributor

peterdschwartz commented Feb 27, 2024

@rljacob Same error message for that test. I removed some submodules and rechecked them out to ensure a clean working tree and same error message.

Also, There are many diffs due to missing field lists.

SUMMARY of cprnc:
 A total number of    186 fields were compared
          of which      0 had non-zero differences
               and      0 had differences in fill patterns
               and      0 had different dimension sizes
               and      0 had different data types
 A total number of      0 fields could not be analyzed
 A total number of      0 time-varying fields on file 1 were not found on file 2.
 A total number of      0 time-constant fields on file 1 were not found on file 2.
 A total number of     10 time-varying fields on file 2 were not found on file 1.
 A total number of      0 time-constant fields on file 2 were not found on file 1.
  diff_test: the two files DIFFER only in their field lists

List of tests with DIFFs ( i didn't check them all to see if they're the same yet)

     FAIL ERIO.ne30_g16_rx1.A.chrysalis_intel BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERP_Ld15.ne4pg2_ne4pg2.IELMFATES.chrysalis_intel.elm-fates_cold_allvars BASELINE master: DIFF
    FAIL ERS.MOS_USRDAT.RMOSNLDAS.chrysalis_intel.mosart-sediment BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS.f09_f09.IELM.chrysalis_intel.elm-lnd_rof_2way BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS.f09_g16.I1850ELMCN.chrysalis_intel.elm-bgcinterface BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS.f09_g16.I1850GSWCNPRDCTCBC.chrysalis_intel.elm-vstrd BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS.f09_g16.IELMBC.chrysalis_intel BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS.f09_g16.IELMBC.chrysalis_intel.elm-simple_decomp BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS.f19_f19.I1850ELMCN.chrysalis_intel BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS.f19_f19.I20TRELMCN.chrysalis_intel BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS.f19_g16.I1850CNECACNTBC.chrysalis_intel.elm-eca BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS.f19_g16.I1850CNECACTCBC.chrysalis_intel.elm-eca BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS.f19_g16.I1850CNRDCTCBC.chrysalis_intel.elm-rd BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS.f19_g16.I1850ELM.chrysalis_intel.elm-betr BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS.f19_g16.I1850ELM.chrysalis_intel.elm-vst BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS.f19_g16.I1850GSWCNPECACNTBC.chrysalis_intel.elm-eca_f19_g16_I1850GSWCNPECACNTBC BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS.f19_g16.I20TRGSWCNPECACNTBC.chrysalis_intel.elm-eca_f19_g16_I20TRGSWCNPECACNTBC BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS.f19_g16.I20TRGSWCNPRDCTCBC.chrysalis_intel.elm-ctc_f19_g16_I20TRGSWCNPRDCTCBC BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS.f19_g16_rx1.A.chrysalis_intel BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS.hcru_hcru.I20TRGSWCNPRDCTCBC.chrysalis_intel.elm-erosion BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS.ne30_g16_rx1.A.chrysalis_intel BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS.ne30pg2_r05_IcoswISC30E3r5.GPMPAS-JRA.chrysalis_intel.mosart-rof_ocn_2way BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS.r05_r05.IELM.chrysalis_intel.elm-V2_ELM_MOSART_features BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS.r05_r05.RMOSGPCC.chrysalis_intel.mosart-gpcc_1972 BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS.r05_r05.RMOSGPCC.chrysalis_intel.mosart-heat BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS_D.f09_f09.IELM.chrysalis_intel.elm-koch_snowflake BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS_D.f09_f09.IELM.chrysalis_intel.elm-solar_rad BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS_D.f09_g16.I1850ELMCN.chrysalis_intel BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS_D.f19_f19.IELM.chrysalis_intel.elm-ic_f19_f19_ielm BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS_D.f19_g16.I1850GSWCNPRDCTCBC.chrysalis_intel.elm-ctc_f19_g16_I1850GSWCNPRDCTCBC BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS_D.ne4pg2_oQU480.F2010.chrysalis_intel.eam-hommexx BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS_D_Ld15.f45_g37.IELMFATES.chrysalis_intel.elm-fates_cold_treedamage BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS_Ld20.f45_f45.IELMFATES.chrysalis_intel.elm-fates BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS_Ld3.ne4pg2_oQU480.F2010.chrysalis_intel.eam-thetahy_sl_pg2 BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS_Ld3.ne4pg2_oQU480.F2010.chrysalis_intel.eam-thetahy_sl_pg2_ftype0 BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS_Ld30.f45_f45.IELMFATES.chrysalis_intel.elm-fates_satphen BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS_Ld30.f45_g37.IELMFATES.chrysalis_intel.elm-fates_cold_sizeagemort BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS_Ld5.T62_oQU120.CMPASO-NYF.chrysalis_intel BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL ERS_Ld5.T62_oQU240.DTESTM.chrysalis_intel BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
     FAIL NCK.f19_g16_rx1.A.chrysalis_intel BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL PEM_Ln5.T62_oQU240wLI.DTESTM.chrysalis_intel BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL PET_Ln5.T62_oQU240.DTESTM.chrysalis_intel BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL SEQ.f19_g16.X.chrysalis_intel BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL SMS.MOS_USRDAT.RMOSGPCC.chrysalis_intel.mosart-unstructure BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL SMS.T62_oQU120_ais20.MPAS_LISIO_TEST.chrysalis_intel BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL SMS.f09_g16_a.IGELM_MLI.chrysalis_intel BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL SMS.ne30_f19_g16_rx1.A.chrysalis_intel BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL SMS.ne4pg2_oQU480.F2010.chrysalis_intel.eam-cosplite BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL SMS.r05_r05.I1850ELMCN.chrysalis_intel.elm-qian_1948 BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL SMS.r05_r05.IELM.chrysalis_intel.elm-topounit BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL SMS_D_Ld1.TL319_IcoswISC30E3r5.DTESTM-JRA1p5.chrysalis_intel.mpassi-jra_1958 BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL SMS_D_Ld20.f45_f45.IELMFATES.chrysalis_intel.elm-fates_rd BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL SMS_D_Ln5.ne4pg2_oQU480.F2010.chrysalis_intel BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL SMS_Ld1.T62_oQU240wLI.GMPAS-IAF-DISMF.chrysalis_intel BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL SMS_Ld1.hcru_hcru.I1850CRUELMCN.chrysalis_intel BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL SMS_Ld20.f45_f45.IELMFATES.chrysalis_intel.elm-fates_eca BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL SMS_Ld5_PS.f19_g16.IELMFATES.chrysalis_intel.elm-fates_cold BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL SMS_Ln5.ne4pg2_oQU480.F2010.chrysalis_intel BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL SMS_Ln5.ne4pg2_oQU480.F2010.chrysalis_intel.eam-thetahy_pg2 BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL SMS_Ln5.ne4pg2_oQU480.F2010.chrysalis_intel.eam-thetahy_sl_pg2 BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL SMS_Ln5.ne4pg2_oQU480.F2010.chrysalis_intel.eam-thetahy_sl_pg2_ftype0 BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)
    FAIL SMS_Ln9.ne4pg2_oQU480.F2010.chrysalis_intel.eam-outfrq9s BASELINE master: DIFF
    FAIL SMS_P12x2.ne4pg2_oQU480.WCYCL1850NS.chrysalis_intel.allactive-mach_mods BASELINE master: FIELDLIST field lists differ (otherwise bit-for-bit)

@rljacob
Copy link
Member

rljacob commented Feb 27, 2024

Oh yes this will remove fields and so will show a diff for that reason. But there should be no RMS diffs.

@peterdschwartz
Copy link
Contributor

I updated the previous comment with the baseline comparison lines. Only two actual DIFFs are due to the fix budget PR. The FAIL for ERS_D.ne4pg2_oQU480.I20TRELM.chrysalis_intel.elm-disableDynpftCheck then should be the only unexpected result

@rljacob
Copy link
Member

rljacob commented Feb 28, 2024

update: the test fail in ERS_D.ne4pg2_oQU480.I20TRELM.chrysalis_intel.elm-disableDynpftCheck is from the pelayout which the Jenkins testing avoids. So there are only removed-field diffs from this PR.

@peterdschwartz
Copy link
Contributor

peterdschwartz commented Feb 28, 2024

@rljacob You want this merged to next today?

Edit: sorry, just saw the email

peterdschwartz added a commit that referenced this pull request Feb 28, 2024
The heat model in MOSART is not supported by default. Thus, the
default value of rof_heat is set to .false..

[NML]
[BFB] but removes fields from coupler history.
@peterdschwartz
Copy link
Contributor

Merged to next

@rljacob rljacob modified the milestones: v3.0.0-rc1, v3.0.0-rc2 Feb 29, 2024
@peterdschwartz
Copy link
Contributor

Looking at the DIFFs, pretty much all look as expected. Here's a list of tests that may be unexpected / due to previous days PRs:

 SMS.ne30pg2_r05_IcoswISC30E3r5.F20TR.chrysalis_intel.eam-wcprod_F20TR  ## ER / SOM_C_LEACHED DIFF/FILLDIFF
SMS_R_Ld5.ne4_ne4.FSCM-ARM97.pm-cpu_gnu.eam-scm  ## tiny 1.E-154 diff in area?

@rljacob
Copy link
Member

rljacob commented Feb 29, 2024

Both of those diffs were already there so please bless everything.

@peterdschwartz peterdschwartz merged commit c8208a4 into master Feb 29, 2024
10 checks passed
@peterdschwartz peterdschwartz deleted the bishtgautam/river/fix-namelist branch February 29, 2024 16:48
@peterdschwartz
Copy link
Contributor

Merged to master and I submitted bless requests except for gcp12. Requested the NML diffs for anvil prod (all run time fails currently). Waiting on mappy_next_gnu, and the tests that failed on pm-cpu

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
BFB PR leaves answers BFB NML River
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants