feature/coupled-crow: Updates for consistency (#199)

* updated checkout build and link to use new unified model - changed a few names from fv3 to ufs * updates for linking to new fix * point to a particular hash of ufs model * remove theia modules * update ww3 build for fv3->ufs naming change * adding WW3 to build * updates for having cice fix file have resolution folders and removing cice5 references * remove CODEwave as it is an unused variable * more fv3->ufs dir name changes * update location of fd_nems.yaml file for CMEPS-interface change * modules used for successful forecast and atm post, but ocn post failed * remove nowave parm file * rename w/wave file * change of parameters for mom6 to match rt tests * add all the parm files for ocean * updates for MOM6 to use same MOM_input templates as used in rt tests/parm dir * add one-step option to no wave case
NOAA-EMC · Dec 4, 2020 · a798d9b · a798d9b
1 parent 630a8f7
commit a798d9b
Show file tree

Hide file tree

Showing 26 changed files with 1,106 additions and 214 deletions.
diff --git a/.gitignore b/.gitignore
@@ -57,6 +57,7 @@ scripts/exglobal_innovate_obs_fv3gfs.sh.ecf
 scripts/exglobal_pmgr.sh.ecf
 sorc/calc_increment_ens.fd
 sorc/checkout-fv3gfs.log
+sorc/checkout-ufs_coupled.log
 sorc/checkout-gfs_post.log
 sorc/checkout-gfs_wafs.log
 sorc/checkout-gsi.log
@@ -118,6 +119,7 @@ sorc/recentersigp.fd
 sorc/shave.fd
 sorc/tocsbufr.fd/tocsbufr.o
 sorc/ufs_utils.fd/
+sorc/ufs_coupled.fd/
 sorc/verif-global.fd/
 sorc/wafs_awc_wafavn.fd
 sorc/wafs_blending.fd

diff --git a/Externals_coupled.cfg b/Externals_coupled.cfg
@@ -1,6 +1,6 @@
 [ufs-s2s-model]
 tag = ufss2s_cmeps_v0.7 
-local_path = sorc/fv3_coupled.fd
+local_path = sorc/ufs_coupled.fd
 repo_url = https://github.com/ufs-community/ufs-s2s-model
 protocol = git
 required = True

diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ sh checkout.sh coupled                      # Check out the coupled code, EMC_po
 ```
 sh build_ncep_post.sh        #This command will build ncep_post
 sh build_ww3prepost.sh       #This command will build ww3 prep and post exes
-sh build_fv3_coupled.sh      #This command will build ufs-s2s-model
+sh build_ufs_coupled.sh      #This command will build the UFS coupled model exe
 sh build_reg2grb2.sh         #This command will build exes for ocean-ice post
 
 To link fixed files and executable programs for the coupled application:

diff --git a/jobs/rocoto/coupled_ic.sh b/jobs/rocoto/coupled_ic.sh
@@ -57,7 +57,7 @@ cp -r $ORIGIN_ROOT/$CPL_ATMIC/$CDATE/$CDUMP  $ICSDIR/$CDATE/
 cp -r $ORIGIN_ROOT/$CPL_OCNIC/$CDATE/ocn/$OCNRES/MOM*.nc  $ICSDIR/$CDATE/ocn/
 
 #Setup Ice IC files 
-cp $ORIGIN_ROOT/$CPL_ICEIC/$CDATE/ice/$ICERES/cice5_model_${ICERESdec}.res_$CDATE.nc $ICSDIR/$CDATE/ice/
+cp $ORIGIN_ROOT/$CPL_ICEIC/$CDATE/ice/$ICERES/cice5_model_${ICERESdec}.res_$CDATE.nc $ICSDIR/$CDATE/ice/cice_model_${ICERESdec}.res_$CDATE.nc
 
 if [ $cplwav = ".true." ]; then
   [[ ! -d $ICSDIR/$CDATE/wav ]] && mkdir -p $ICSDIR/$CDATE/wav

diff --git a/modulefiles/gfs_bufr.theia b/modulefiles/gfs_bufr.theia
diff --git a/modulefiles/module_base.orion b/modulefiles/module_base.orion
@@ -9,38 +9,54 @@
 module load contrib noaatools
 
 ##
-## load programming environment
-## this typically includes compiler, MPI and job scheduler
-##
-module load intel/2018
-module load impi/2018
+module load cmake/3.17.3
+setenv CMAKE_C_COMPILER mpiicc
+setenv CMAKE_CXX_COMPILER mpiicpc
+setenv CMAKE_Fortran_COMPILER mpiifort
+setenv CMAKE_Platform orion.intel
+
+
+module use /apps/contrib/NCEP/libs/hpc-stack/v1.0.0-beta1/modulefiles/stack
+
+module load hpc/1.0.0-beta1
+module load hpc-intel/2018.4
+module load hpc-impi/2018.4
+
 
 #For ocean post: 
 module load ncl/6.6.2
 module load nco/4.8.1
 
+module load jasper/2.0.15
+module load zlib/1.2.11
+module load png/1.6.35
+
+module load hdf5/1.10.6
+module load netcdf/4.7.4
+module load pio/2.5.1
+module load esmf/8_1_0_beta_snapshot_27
+
+module load bacio/2.4.1
+module load crtm/2.3.0
+module load g2/3.4.1
+module load g2tmpl/1.9.1
+module load ip/3.3.3
+module load nceppost/dceca26
+module load nemsio/2.5.2
+module load sp/2.3.3
+module load w3emc/2.7.3
+module load w3nco/2.4.1
+
 ##
-## NCEP libraries (temporary version to match the CCPP requirements)
+## NCEP libraries for atm post and other 
 ##
 module use -a /apps/contrib/NCEPLIBS/orion/cmake/install/NCEPLIBS/modules
-module load bacio/2.4.0
-module load crtm_dev/2.3.0
-module load g2/3.4.0
-module load g2tmpl/1.9.0
-module load ip/3.3.0
-module load nceppost/dceca26
-module load nemsio/2.5.1
-module load sp/2.3.0
-module load w3emc/2.7.0
-module load w3nco/2.4.0
 
 module load gfsio/1.4.0
 module load sfcio/1.4.0
 module load sigio/2.3.0
 
 module use /apps/contrib/NCEPLIBS/orion/modulefiles
-module load jasper/1.900.2
-module load png/1.2.44
 module load z/1.2.6
 
 module load prod_util/1.2.0
@@ -58,11 +74,3 @@ module load grib_util/1.2.0
 
 module load slurm/19.05.3-2
 
-##
-### load cmake
-###
-module load cmake/3.15.4
-setenv CMAKE_C_COMPILER mpiicc
-setenv CMAKE_CXX_COMPILER mpiicpc
-setenv CMAKE_Fortran_COMPILER mpiifort
-setenv CMAKE_Platform orion.intel
diff --git a/modulefiles/module_base.theia b/modulefiles/module_base.theia
diff --git a/parm/mom6/MOM_input_025_wav → parm/mom6/MOM_input_template_025 b/parm/mom6/MOM_input_025_wav → parm/mom6/MOM_input_template_025
@@ -19,19 +19,19 @@ THICKNESSDIFFUSE = True         !   [Boolean] default = False
 THICKNESSDIFFUSE_FIRST = True   !   [Boolean] default = False
                                 ! If true, do thickness diffusion before dynamics.
                                 ! This is only used if THICKNESSDIFFUSE is true.
-DT = 900.0                      !   [s]
+DT = DT_DYNAM_MOM6              !   [s]
                                 ! The (baroclinic) dynamics time step.  The time-step that
                                 ! is actually used will be an integer fraction of the
                                 ! forcing time-step (DT_FORCING in ocean-only mode or the
                                 ! coupling timestep in coupled mode.)
-DT_THERM = 1800.0               !   [s] default = 900.0
+DT_THERM = DT_THERM_MOM6        !   [s] default = 900.0
                                 ! The thermodynamic and tracer advection time step.
                                 ! Ideally DT_THERM should be an integer multiple of DT
                                 ! and less than the forcing or coupling time-step, unless
                                 ! THERMO_SPANS_COUPLING is true, in which case DT_THERM
                                 ! can be an integer multiple of the coupling timestep.  By
                                 ! default DT_THERM is set to DT.
-THERMO_SPANS_COUPLING = True    !   [Boolean] default = False
+THERMO_SPANS_COUPLING = MOM6_THERMO_SPAN   !   [Boolean] default = False
                                 ! If true, the MOM will take thermodynamic and tracer
                                 ! timesteps that can be longer than the coupling timestep.
                                 ! The actual thermodynamic timestep that is used in this
@@ -82,11 +82,11 @@ WRITE_GEOM = 2                  ! default = 1
 TRIPOLAR_N = True               !   [Boolean] default = False
                                 ! Use tripolar connectivity at the northern edge of the
                                 ! domain.  With TRIPOLAR_N, NIGLOBAL must be even.
-NIGLOBAL = 1440                 !
+NIGLOBAL = NX_GLB               !
                                 ! The total number of thickness grid points in the
                                 ! x-direction in the physical domain. With STATIC_MEMORY_
                                 ! this is set in MOM_memory.h at compile time.
-NJGLOBAL = 1080                 !
+NJGLOBAL = NY_GLB               !
                                 ! The total number of thickness grid points in the
                                 ! y-direction in the physical domain. With STATIC_MEMORY_
                                 ! this is set in MOM_memory.h at compile time.
@@ -187,7 +187,6 @@ DTFREEZE_DP = -7.75E-08         !   [deg C Pa-1] default = 0.0
                                 ! temperature with pressure.
 
 ! === module MOM_restart ===
-RESTART_CHECKSUMS_REQUIRED = False
 PARALLEL_RESTARTFILES = True    !   [Boolean] default = False
                                 ! If true, each processor writes its own restart file,
                                 ! otherwise a single restart file is generated
@@ -774,7 +773,7 @@ EPBL_TRANSITION_SCALE = 0.01    !   [nondim] default = 0.1
                                 ! A scale for the mixing length in the transition layer
                                 ! at the edge of the boundary layer as a fraction of the
                                 ! boundary layer thickness.  The default is 0.1.
-USE_LA_LI2016 = True            !   [nondim] default = False
+USE_LA_LI2016 = MOM6_REPRO_LA   !   [nondim] default = False
                                 ! A logical to use the Li et al. 2016 (submitted) formula to
                                 !  determine the Langmuir number.
 LT_ENHANCE = 3                  !   [nondim] default = 0
@@ -784,7 +783,7 @@ LT_ENHANCE = 3                  !   [nondim] default = 0
                                 !          1 - Van Roekel et al. 2014/Li et al., 2016
                                 !          2 - Multiplied w/ adjusted La.
                                 !          3 - Added w/ adjusted La.
-USE_WAVES = True                !   [Boolean] default = False
+USE_WAVES = MOM6_USE_WAVES      !   [Boolean] default = False
                                 ! If true, enables surface wave modules.
 WAVE_METHOD = "SURFACE_BANDS"   ! default = "EMPTY"
                                 ! Choice of wave method, valid options include:
@@ -831,9 +830,7 @@ VAR_PEN_SW = True               !   [Boolean] default = False
                                 ! If true, use one of the CHL_A schemes specified by
                                 ! OPACITY_SCHEME to determine the e-folding depth of
                                 ! incoming short wave radiation.
-!CHL_FILE = "seawifs_1998-2006_smoothed_2X.v20140616.nc" !
-CHL_FILE = "seawifs-clim-1997-2010.1440x1080.v20180328.nc"
-                                ! CHL_FILE is the file containing chl_a concentrations in
+CHL_FILE = CHLCLIM              ! CHL_FILE is the file containing chl_a concentrations in
                                 ! the variable CHL_A. It is used when VAR_PEN_SW and
                                 ! CHL_FROM_FILE are true.
 CHL_VARNAME = "chlor_a"         ! default = "CHL_A"
@@ -894,11 +891,11 @@ USE_RIGID_SEA_ICE = True        !   [Boolean] default = False
 SEA_ICE_RIGID_MASS = 100.0      !   [kg m-2] default = 1000.0
                                 ! The mass of sea-ice per unit area at which the sea-ice
                                 ! starts to exhibit rigidity
-LIQUID_RUNOFF_FROM_DATA = True  !   [Boolean] default = False
+LIQUID_RUNOFF_FROM_DATA = MOM6_RIVER_RUNOFF  !   [Boolean] default = False
                                 ! If true, allows liquid river runoff to be specified via
                                 ! the data_table using the component name 'OCN'.
 ! === module MOM_restart ===
-
+RESTART_CHECKSUMS_REQUIRED = False
 ! === module MOM_sum_output ===
 CALCULATE_APE = False           !   [Boolean] default = True
                                 ! If true, calculate the available potential energy of