Skip to content

Add Fortran modules for CFSR and GEFS data sources and add a new subroutine to get data stream parameters from ESMF configuration files#73

Merged
jedwards4b merged 14 commits into
ESCOMP:masterfrom
binli2337:feature/update20
May 3, 2021

Conversation

@binli2337
Copy link
Copy Markdown
Contributor

@binli2337 binli2337 commented Apr 29, 2021

Description of changes

This PR includes the following updates:

  1. Add Fortran module for CFSR data source.
  2. Add Fortran module for GEFS data source.
  3. Add a new subroutine shr_stream_init_from_esmfconfig to dshr_stream_mod.F90 to get data stream parameters from ESMF configuration files.

Specific notes

The CFSR and GEFS input forcing files and mesh files are located in the baseline directories of the regression tests. For example, the files are located at /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/input-data-20210428/DATM_CDEPS on Orion.

The scripts used to create the mesh files will be added to the following location:
https://github.com/NOAA-EMC/DATM-MOM6-CICE5/tree/develop/utilities.

Contributors other than yourself, if any: Jun.Wang@noaa.gov

CMEPS Issues Fixed (include github issue #):

Are there dependencies on other component PRs

  • CIME (list)
  • CMEPS (list)

Are changes expected to change answers?

  • bit for bit
  • different at roundoff level
  • more substantial

Any User Interface Changes (namelist or namelist defaults changes)?

  • Yes
  • No

Testing performed:

  • (required) aux_cdeps
    • machines and compilers:
    • details (e.g. failed tests):
  • (optional) CESM prealpha test
    • machines and compilers
    • details (e.g. failed tests):

Hashes used for testing:

binli2337 and others added 10 commits December 9, 2020 09:03
Update CDEPS to the 20201124 version of the master branch at ESCOMP/CDEPS.
Fortran subroutines used for CFSR data source are added.
The updated code can be compiled successfully on Hera.
This update includes component-level PIO initialization feature from the ESCOMP/CDEPS master branch.
* remove FoX depdencies
* remove fox submodule
* update streamfilename

Co-authored-by: Jun Wang <junwang-noaa@users.noreply.github.com>
Comment thread datm/datm_datamode_cfsr_mod.F90 Outdated
@@ -0,0 +1,258 @@
module datm_datamode_cfsr_mod

use ESMF
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Please add an only clause here. CDEPS uses only clause for all module use statements.

Comment thread datm/datm_datamode_cfsr_mod.F90 Outdated
integer :: lsize ! size of attr vect
real(r8) :: rtmp
real(r8) :: tbot, pbot
! real(r8) :: vp
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

remove commented declaration

Comment thread datm/datm_datamode_cfsr_mod.F90 Outdated

do n = 1, lsize
!--- bottom layer height ---
! Sa_z(n) = 10.0_r8
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

remove commented code

Comment thread datm/datm_datamode_gefs_mod.F90 Outdated
@@ -0,0 +1,258 @@
module datm_datamode_gefs_mod

use ESMF
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

CDEPS uses only clause throughout, please add here.

@jedwards4b
Copy link
Copy Markdown
Contributor

jedwards4b commented Apr 29, 2021

I don't see how this could work. You have replaced shr_strdata_init_from_xml with shr_strdata_init_from_config - but your new subroutine is named shr_strdata_init_from_esmfconfig
So it won't currently work for NOAA, it's also not backward compatible since you have removed the
shr_strdata_init_from_xml from the use in datm and dice.

Sorry - I understand now. I withdraw this comment.

@jedwards4b jedwards4b requested a review from uturuncoglu April 30, 2021 13:59
Copy link
Copy Markdown
Collaborator

@uturuncoglu uturuncoglu left a comment

Choose a reason for hiding this comment

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

Before merging this PR, I need to run full CESM test suit to be sure it is not breathing anything in CESM side. I'll update you about it.

@@ -0,0 +1,252 @@
module datm_datamode_cfsr_mod
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I think it is better to put some information to this PR about how data need to be downloaded for CFSR (which data repository, Information if data requires pre-processing etc.) and how ESMF Mesh file is created. This will help to other users that plan to use CFSR streams.

@@ -0,0 +1,252 @@
module datm_datamode_gefs_mod
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Same. Please add some information to the PR about usage of this data stream (download etc.).

@uturuncoglu
Copy link
Copy Markdown
Collaborator

All CDEPS aux tests are passed. I am also running CESM prealpha tests but they are still running.

Copy link
Copy Markdown
Collaborator

@uturuncoglu uturuncoglu left a comment

Choose a reason for hiding this comment

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

I saw some information in the PR about the preparing datasets. So, I am approving this PR but please wait for CESM tests before merge.

@uturuncoglu
Copy link
Copy Markdown
Collaborator

uturuncoglu commented May 3, 2021

@jedwards4b @mvertens I checked the CDEPS aux tests and it seems that SMS_Vnuopc_Ln5.f19_f19_mg17.2000_DATM%QIA_SLND_SICE_DOCN%SOMAQP_SROF_SGLC_SWAV is failing because docn.streams.xml is missing in the run directory. I think this is not related with the PR but it could be related with the CIME and xml definitions. You could find the run directory in here /glade/scratch/turuncu/SMS_Vnuopc_Ln5.f19_f19_mg17.2000_DATM%QIA_SLND_SICE_DOCN%SOMAQP_SROF_SGLC_SWAV.cheyenne_intel.20210502_223809_wzg3fl and trace is complaining about the docn.streams.xml file. I tried to remove run directory and allow case to create it again but it is same. It might be issue with DOCN%SOMAQP data stream. Anyway, let me know what do you think?

@jedwards4b
Copy link
Copy Markdown
Contributor

@ufuk I've opened issue #83

@uturuncoglu
Copy link
Copy Markdown
Collaborator

@jedwards4b thanks. do we need to test it again?

@jedwards4b
Copy link
Copy Markdown
Contributor

@uturuncoglu See #84 - I merged this PR with that one for testing. I don't think we need further testing here.

@uturuncoglu
Copy link
Copy Markdown
Collaborator

@jedwards4b Okay. That is great. Then we could merge this PR.

@binli2337 once the PR is merged, could you also update the NOAA-EMC fork. BTW, when do you plan to update UFS Whether Model with new version of CDEPS. Eventually, that needs to go HAFS and I could start working on that level.

@uturuncoglu
Copy link
Copy Markdown
Collaborator

@jedwards4b BTW, you could see other failed prealpha tests in here.

  DAE_N2_D_Lh12_Vnuopc.f10_f10_mg37.I2000Clm50BgcCrop.cheyenne_intel.clm-DA_multidrv (Overall: FAIL) details:
    FAIL DAE_N2_D_Lh12_Vnuopc.f10_f10_mg37.I2000Clm50BgcCrop.cheyenne_intel.clm-DA_multidrv RUN time=1225
  ERC_D_Ln9_Vnuopc.mpasa480z32_mpasa480.FHS94.cheyenne_intel.cam-outfrq3s_usecase (Overall: FAIL) details:
    FAIL ERC_D_Ln9_Vnuopc.mpasa480z32_mpasa480.FHS94.cheyenne_intel.cam-outfrq3s_usecase MODEL_BUILD time=14
  ERI_Vnuopc.f09_g17.B1850.cheyenne_intel.allactive-defaultio (Overall: FAIL) details:
    FAIL ERI_Vnuopc.f09_g17.B1850.cheyenne_intel.allactive-defaultio RUN time=3642
  ERP_D_Ln9_Vnuopc.C48_C48_mg17.QPC6.cheyenne_intel.cam-outfrq9s (Overall: FAIL) details:
    FAIL ERP_D_Ln9_Vnuopc.C48_C48_mg17.QPC6.cheyenne_intel.cam-outfrq9s MODEL_BUILD time=1
  ERP_D_Ln9_Vnuopc.f09_f09_mg17.FSD.cheyenne_intel.cam-outfrq9s_contrail (Overall: FAIL) details:
    FAIL ERP_D_Ln9_Vnuopc.f09_f09_mg17.FSD.cheyenne_intel.cam-outfrq9s_contrail RUN time=168
  ERP_D_Ln9_Vnuopc.f09_f09_mg17.QSC6.cheyenne_intel.cam-outfrq9s (Overall: FAIL) details:
    FAIL ERP_D_Ln9_Vnuopc.f09_f09_mg17.QSC6.cheyenne_intel.cam-outfrq9s RUN time=26
  ERS_Ld3_Vnuopc.f19_f19_mg17.FXHIST.cheyenne_intel.cam-waccmx_weimer (Overall: FAIL) details:
    FAIL ERS_Ld3_Vnuopc.f19_f19_mg17.FXHIST.cheyenne_intel.cam-waccmx_weimer RUN time=122
  IRT_N3_PM3_Ld7_Vnuopc.f19_g17.BHIST.cheyenne_intel.allactive-defaultio (Overall: FAIL) details:
    FAIL IRT_N3_PM3_Ld7_Vnuopc.f19_g17.BHIST.cheyenne_intel.allactive-defaultio SHAREDLIB_BUILD time=1
  NCK_Ld5_Vnuopc.f19_g17.B1850G.cheyenne_intel.allactive-cism-test_coupling (Overall: FAIL) details:
    FAIL NCK_Ld5_Vnuopc.f19_g17.B1850G.cheyenne_intel.allactive-cism-test_coupling COMPARE_base_multiinst
  NCK_Vnuopc.f19_g17.B1850.cheyenne_intel.allactive-defaultiomi (Overall: FAIL) details:
    FAIL NCK_Vnuopc.f19_g17.B1850.cheyenne_intel.allactive-defaultiomi COMPARE_base_multiinst
  SMS_D_Ln9_Vnuopc.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCnudged.cheyenne_intel.cam-outfrq9s_refined_camchem (Overall: FAIL) details:
    FAIL SMS_D_Ln9_Vnuopc.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCnudged.cheyenne_intel.cam-outfrq9s_refined_camchem RUN time=646
  SMS_D_Ln9_Vnuopc.T42_T42.FSCAM.cheyenne_intel.cam-scam_mpace_outfrq9s (Overall: FAIL) details:
    FAIL SMS_D_Ln9_Vnuopc.T42_T42.FSCAM.cheyenne_intel.cam-scam_mpace_outfrq9s RUN time=10
  SMS_Ln9_Vnuopc.f19_f19_mg17.FXHIST.cheyenne_intel.cam-outfrq9s_multi (Overall: FAIL) details:
    FAIL SMS_Ln9_Vnuopc.f19_f19_mg17.FXHIST.cheyenne_intel.cam-outfrq9s_multi RUN time=1825

Some of them was also failing in the previous PR.

@jedwards4b jedwards4b merged commit 6ced48f into ESCOMP:master May 3, 2021
@binli2337 binli2337 deleted the feature/update20 branch May 24, 2021 17:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants