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.

Sign up for GitHub

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

Jump to bottom

Add ICOS30 wave mesh for E3SMv3. #6706

Merged
merged 17 commits into from
Nov 11, 2024
Merged

Add ICOS30 wave mesh for E3SMv3. #6706

merged 17 commits into from
Nov 11, 2024

Conversation

erinethomas
Copy link
Contributor

@erinethomas erinethomas commented Oct 22, 2024 •
edited by sbrus89
Loading

Add ICOS30 mesh for WAVEWATCHIII.

[BFB]

@erinethomas erinethomas added BFB PR leaves answers BFB Wave labels Oct 22, 2024
@erinethomas erinethomas requested a review from sbrus89 October 22, 2024 18:32
@mahf708
Copy link
Contributor

mahf708 commented Oct 22, 2024 •
edited
Loading

FYI: Fail in gh / ci-w (SMS_D_Ld1_P8.ne4pg2_oQU480.WCYCL2010NS.ghci-oci_gnu) is legitimate (appears to be caused by this PR)

At line 507 of file /projects/e3sm/scratch/SMS_D_Ld1_P8.ne4pg2_oQU480.WCYCL2010NS.ghci-oci_gnu.20241022_183621_e2h2te/bld/cmake-bld/core_ocean/shared/mpas_ocn_vmix_cvmix.f90
Fortran runtime error: Index '1' of dimension 1 of array 'landicemask' below lower bound of 2314885530818453536

@erinethomas erinethomas mentioned this pull request Oct 24, 2024
Open
@erinethomas
Copy link
Contributor Author

this latest commit fixes the previous error for configurations that do not have ice shelf cavities (configurations where LandIceMask does not exist). My tests of this PR now pass the SMS_D_Ln5_P4.ne4pg2_oQU480.F2010 test.

sbrus89
sbrus89 reviewed Nov 5, 2024
View reviewed changes
driver-mct/main/prep_ocn_mod.F90 Outdated
@@ -1446,7 +1446,7 @@ subroutine prep_ocn_calc_w2x_ox(timer)
call t_drvstartf (trim(timer),barrier=mpicom_CPLID)
do ewi = 1,num_inst_wav
w2x_wx => component_get_c2x_cx(wav(ewi))
call seq_map_map(mapper_Sw2o, w2x_wx, w2x_ox(ewi), norm=.true.)
call seq_map_map(mapper_Sw2o, w2x_wx, w2x_ox(ewi),fldlist=seq_flds_w2x_states, norm=.true.)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this change also be held back for the flux coupling PR? I'm seeing seg faults in SMS_D_Ln3.ne30pg2_IcoswISC30E3r5_wQU225Icos30E3r5.WCYCL1850-WW3.chrysalis_intel and this seems to be a likely culprit:

 45: forrtl: error (78): process killed (SIGTERM)
 45: Image              PC                Routine            Line        Source     
 45: libpnetcdf.so.3.0  000015554B93D62C  for__signal_handl     Unknown  Unknown
 45: libpthread-2.28.s  00001555483F4CF0  Unknown               Unknown  Unknown
 45: libmpi.so.40.30.6  00001555488AAFC1  ompi_request_defa     Unknown  Unknown
 45: libmpi.so.40.30.6  00001555488E1083  MPI_Waitany           Unknown  Unknown
 45: libmpi_mpifh.so.4  0000155548E7D6FD  pmpi_waitany          Unknown  Unknown
 45: e3sm.exe           0000000010D6AF8F  m_rearranger_mp_r        1269  m_Rearranger.F90
 45: e3sm.exe           00000000008AFA29  seq_map_mod_mp_se         345  seq_map_mod.F90
 45: e3sm.exe           00000000004AC719  component_mod_mp_         908  component_mod.F90
 45: e3sm.exe           00000000004800F6  cime_comp_mod_mp_        4597  cime_comp_mod.F90
 45: e3sm.exe           0000000000460917  cime_comp_mod_mp_        3114  cime_comp_mod.F90
 45: e3sm.exe           000000000048F7E5  MAIN__                    153  cime_driver.F90
 45: e3sm.exe           0000000000427BE2  Unknown               Unknown  Unknown
 45: libc-2.28.so       0000155548057D85  __libc_start_main     Unknown  Unknown
 45: e3sm.exe           0000000000427AEE  Unknown               Unknown  Unknown
 45: [chr-0497:408078:0:408078] Caught signal 11 (Segmentation fault: address not mapped to object at address (nil))

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah yes - separating the states from fluxes should all go in the flux coupling pr - sorry

sbrus89
sbrus89 reviewed Nov 6, 2024
View reviewed changes
Copy link
Contributor

@sbrus89 sbrus89 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This passes:

ERP_Ld3.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.chrysalis_intel.allactive-pioroot1

and is BFB with the previous baseline cases:

SMS_D_Ln3.TL319_EC30to60E2r2_wQU225EC30to60E2r2.GMPAS-JRA1p5-WW3.chrysalis_intel.ww3-jra_1958 
ERS.TL319_EC30to60E2r2_wQU225EC30to60E2r2.GMPAS-JRA1p5-WW3.chrysalis_intel.ww3-jra_1958
PEM.TL319_EC30to60E2r2_wQU225EC30to60E2r2.GMPAS-JRA1p5-WW3.chrysalis_intel.ww3-jra_1958
PET.TL319_EC30to60E2r2_wQU225EC30to60E2r2.GMPAS-JRA1p5-WW3.chrysalis_intel.ww3-jra_1958

However, I'm still seeing the same seg faults as before for

SMS_D_Ln3.ne30pg2_IcoswISC30E3r5_wQU225Icos30E3r5.WCYCL1850-WW3.chrysalis_intel

and the other new Icos tests.

@erinethomas
Copy link
Contributor Author

erinethomas commented Nov 6, 2024 •
edited
Loading

ok. not sure what happened. I've seen similar errors before....
Update: all my tests pass successfully.

@erinethomas
Add ICOS30 Wave Mesh.
00f42a7
@erinethomas
mask out sotkes drift under ice shelves for icos mesh.
158d9ce
@erinethomas
add wave-ice remapping files for wQU225Icos30
8cbd06e
@erinethomas
add wav-ocean flux,wav-ice remapping file definitions for ICOS wave mesh
b9a8485
@erinethomas
add wave to ocean FLUX remapper
c8b9aa5
@erinethomas
remove wav-atm, wav-ice coupling (for future PR)
a8e5d2d
@erinethomas
remove seq_map_map call for wave to ocn fluxes (no fluxes coupled yet)
2b82016
@erinethomas
add B case ICOS test to wav_developer test suite
f346119
@erinethomas
trim down wav dev test suite
b1a35ff
@erinethomas
correction to langmuir mixing logic for LandIce Mask.
0404047
@erinethomas
cleanup whitespace
d9ced43
@erinethomas
remove flux wave to ocean remapping (will be done in later PR)
0a87f8b
@erinethomas
remove white space
15a544b
@erinethomas
remove WAV2OCN_FMAPNAME
492554f
@erinethomas
remove wav to ocean flux remapping
ed5d04f
@erinethomas
clean up seq_map_map line for Sw2o
abfd375
@erinethomas erinethomas force-pushed the ww3/add-ICOS30-wave-mesh branch from 5836a21 to abfd375 Compare November 6, 2024 20:47
sbrus89
sbrus89 reviewed Nov 7, 2024
View reviewed changes
cime_config/tests.py Outdated Show resolved Hide resolved
sbrus89
sbrus89 reviewed Nov 7, 2024
View reviewed changes
cime_config/tests.py Outdated Show resolved Hide resolved
sbrus89 added a commit that referenced this pull request Nov 8, 2024
@sbrus89
Merge branch 'erin/ww3/add-ICOS30-wave-mesh' into next (PR #6706)
0e43ed4
sbrus89
sbrus89 approved these changes Nov 8, 2024
View reviewed changes
Copy link
Contributor

@sbrus89 sbrus89 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved. All previous tests pass with baselines and all new tests pass with the new PE and time adjustments. Merged to next.

  ERS.ne30pg2_IcoswISC30E3r5_wQU225Icos30E3r5.WCYCL1850-WW3.chrysalis_intel
  PEM_P480.ne30pg2_IcoswISC30E3r5_wQU225Icos30E3r5.WCYCL1850-WW3.chrysalis_intel
  PET.ne30pg2_IcoswISC30E3r5_wQU225Icos30E3r5.WCYCL1850-WW3.chrysalis_intel
  ERS.TL319_EC30to60E2r2_wQU225EC30to60E2r2.GMPAS-JRA1p5-WW3.chrysalis_intel.ww3-jra_1958
  PEM.TL319_EC30to60E2r2_wQU225EC30to60E2r2.GMPAS-JRA1p5-WW3.chrysalis_intel.ww3-jra_1958
  SMS_D_Ln3.ne30pg2_IcoswISC30E3r5_wQU225Icos30E3r5.WCYCL1850-WW3.chrysalis_intel
  PET.TL319_EC30to60E2r2_wQU225EC30to60E2r2.GMPAS-JRA1p5-WW3.chrysalis_intel.ww3-jra_1958
  SMS_D_Ln3.TL319_EC30to60E2r2_wQU225EC30to60E2r2.GMPAS-JRA1p5-WW3.chrysalis_intel.ww3-jra_1958

@sbrus89 sbrus89 merged commit 9b7efc5 into E3SM-Project:master Nov 11, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sbrus89 sbrus89 sbrus89 approved these changes

Assignees

@sbrus89 sbrus89

Labels
BFB PR leaves answers BFB Wave
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@erinethomas @mahf708 @sbrus89