Merge pull request #102 from grantfirl/ufs-dev-PR73

UFS-dev PR#73
NCAR · Sep 7, 2023 · 076e6ea · 076e6ea
2 parents abed4f9 + c067ea2
commit 076e6ea
Show file tree

Hide file tree

Showing 70 changed files with 4,903 additions and 31,066 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -29,6 +29,13 @@ Provide a detailed description of what this PR does. What bug does it fix, or wh
 - [ ] stochastic_physics
 - [ ] none
 
+### Library Updates/Changes
+<!-- Library updates take time. If this PR needs updates to libraries, please make sure to accomplish the following tasks -->
+- [ ] Not Needed
+- [ ] Create separate issue in [JCSDA/spack-stack](https://github.com/JCSDA/spack-stack) asking for update to library. Include library name, library version.
+- [ ] Add issue link from JCSDA/spack-stack following this item
+<!-- for example: "- JCSDA/spack-stack/issue/1757" -->
+
 ### Combined with PR's (If Applicable):
 
 ## Commit Queue Checklist:

diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS
diff --git a/CMEPS-interface/CMakeLists.txt b/CMEPS-interface/CMakeLists.txt
@@ -30,7 +30,14 @@ list(APPEND _nems_util_files
   CMEPS/ufs/glc_elevclass_mod.F90
   CMEPS/ufs/ufs_kind_mod.F90
   CMEPS/ufs/perf_mod.F90
-  CMEPS/ufs/ufs_const_mod.F90)
+  CMEPS/ufs/ufs_const_mod.F90
+  ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/shr_abort_mod.F90
+  ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/shr_strconvert_mod.F90
+  ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/shr_log_mod.F90
+  ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/shr_sys_mod.F90
+  ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/shr_kind_mod.F90
+  ${PROJECT_SOURCE_DIR}/CDEPS-interface/ufs/cdeps_share/shr_assert_mod.F90
+  ${PROJECT_SOURCE_DIR}/CDEPS-interface/ufs/cdeps_share/shr_infnan_mod.F90)
 
 list(APPEND _mediator_files
   CMEPS/mediator/med_phases_restart_mod.F90
@@ -100,7 +107,7 @@ if(CMEPS_AOFLUX)
     ### Trigger ccpp_prebuild.py script to connect host model with CCPP physics
     message("Calling CCPP code generator (ccpp_prebuild.py) for suites ${_ccpp_suites_arg} ...")
     execute_process(
-                    COMMAND ${Python_EXECUTABLE} 
+                    COMMAND ${Python_EXECUTABLE}
                     "${FV3_PATH}/ccpp/framework/scripts/ccpp_prebuild.py"
                     "--config=CMEPS/ufs/ccpp/config/ccpp_prebuild_config.py"
                     "--builddir=${CMAKE_CURRENT_BINARY_DIR}"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -291,7 +291,7 @@ endif()
 
 if(FV3)
   add_dependencies(ufs fv3atm)
-  list(APPEND _ufs_defs_private FRONT_FV3=fv3gfs_cap_mod)
+  list(APPEND _ufs_defs_private FRONT_FV3=fv3atm_cap_mod)
   list(APPEND _ufs_libs_public fv3atm)
 endif()
 

diff --git a/FV3 b/FV3
diff --git a/modulefiles/ufs_gaea.intel.lua b/modulefiles/ufs_gaea.intel.lua
@@ -7,13 +7,13 @@ whatis([===[Loads libraries needed for building the UFS Weather Model on Gaea ]=
 
 load_any(pathJoin("cmake", os.getenv("cmake_ver") or "3.20.1"),"cmake")
 
-prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/hpc-stack/intel-2022.0.2/modulefiles/stack")
+prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/hpc-stack/intel-classic-2022.0.2/modulefiles/stack")
 load(pathJoin("hpc", os.getenv("hpc_ver") or "1.2.0"))
 
-load(pathJoin("intel-classic", os.getenv("intel_ver") or "2022.0.2"))
-load_any(pathJoin("cray-mpich", os.getenv("cray_mpich_ver") or "7.7.11"),"cray-mpich")
-load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver") or "2022.0.2"))
-load(pathJoin("hpc-cray-mpich", os.getenv("hpc_cray_mpich_ver") or "7.7.11"))
+load(pathJoin("intel-classic", os.getenv("intel_classic_ver") or "2022.0.2"))
+load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver") or "7.7.20"))
+load(pathJoin("hpc-intel-classic", os.getenv("hpc_intel_classic_ver") or "2022.0.2"))
+load(pathJoin("hpc-cray-mpich", os.getenv("hpc_cray_mpich_ver") or "7.7.20"))
 load(pathJoin("libpng", os.getenv("libpng_ver") or "1.6.37"))
 
 -- Needed at runtime:

diff --git a/tests/bl_date.conf b/tests/bl_date.conf
@@ -1,2 +1,2 @@
-export BL_DATE=20230608
+export BL_DATE=20230623
 
diff --git a/tests/bl_date.ncar.conf b/tests/bl_date.ncar.conf
@@ -1,2 +1,2 @@
-export BL_DATE=20230726
+export BL_DATE=20230731
 
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -282,7 +282,7 @@ elif [[ ${MACHINE_ID} = noaacloud ]] ; then
 
     INPES_dflt=3 ; JNPES_dflt=8
     INPES_thrd=3 ; JNPES_thrd=4
-    
+
     INPES_c384=8 ; JNPES_c384=6  ; THRD_c384=2
     INPES_c768=8 ; JNPES_c768=16 ; THRD_c768=2
 
@@ -309,8 +309,7 @@ elif [[ $MACHINE_ID = expanse ]]; then
 
   TPN_cpl_atmw_gdas=12; INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8
   THRD_cpl_atmw_gdas=2; WPG_cpl_atmw_gdas=24; APB_cpl_atmw_gdas="0 311"; WPB_cpl_atmw_gdas="312 559"
-
-
+
 else
 
   echo "Unknown MACHINE_ID ${MACHINE_ID}"
@@ -321,6 +320,7 @@ fi
 WLCLK_dflt=30
 
 export WLCLK=$WLCLK_dflt
+export CMP_DATAONLY=false
 
 export_fv3 ()
 {
@@ -697,6 +697,7 @@ export chm_model=gocart
 export ocn_model=mom6
 export ice_model=cice6
 export wav_model=ww3
+export pio_rearranger=box
 
 export coupling_interval_slow_sec=${DT_THERM_MOM6}
 export coupling_interval_fast_sec=${DT_ATMOS}
@@ -948,6 +949,8 @@ export med_model=cmeps
 export atm_model=datm
 export ocn_model=mom6
 export ice_model=cice6
+export pio_rearranger=box
+
 export ATM_compute_tasks=$ATM_compute_tasks_cdeps_100
 export OCN_tasks=$OCN_tasks_cdeps_100
 export ICE_tasks=$ICE_tasks_cdeps_100
@@ -997,6 +1000,7 @@ export mesh_file=cfsr_mesh.nc
 export MESH_ATM=DATM_INPUT/${mesh_file}
 export atm_datamode=${DATM_SRC}
 export stream_files=DATM_INPUT/${FILENAME_BASE}201110.nc
+export STREAM_OFFSET=0
 
 # MOM6 defaults; 1 degree
 export MOM_INPUT=MOM_input_template_100
@@ -1072,6 +1076,7 @@ export NTILES=1
 
 export ocn_model=docn
 export ocn_datamode=sstdata
+export pio_rearranger=box
 
 export DOCN_IN_CONFIGURE=docn_in
 export DOCN_STREAM_CONFIGURE=hafs_docn.streams.IN
@@ -1141,6 +1146,7 @@ export WAV_CUR='C'
 
 # nems.configure
 export med_model=cmeps
+export pio_rearranger=box
 export CAP_DBUG_FLAG=0
 export RESTART_N=${FHMAX}
 export CPLMODE=hafs

diff --git a/tests/fv3_conf/control_run.IN b/tests/fv3_conf/control_run.IN
@@ -24,6 +24,18 @@ else
     SUFFIX=${BL_SUFFIX}
   fi
 
+  # WAVE restart file for ATMW ORT tests
+  if [[ $CPLWAV == .true. ]]; then
+    if [[ $med_model == cmeps ]] && [[ $RUNTYPE == continue ]]; then
+      # CMEPS restart and pointer files
+      RFILE=ufs.atmw.cpl.r.${RESTART_FILE_SUFFIX_SECS}.nc
+      cp  ../${DEP_RUN}${SUFFIX}/RESTART/${RFILE} .
+      ls -1 ${RFILE}>rpointer.cpl
+    fi
+    RFILE=ufs.atmw.ww3.r.${RESTART_FILE_SUFFIX_SECS}
+    cp ../${DEP_RUN}${SUFFIX}/${RFILE} .
+  fi
+
   if [ $MODEL_INITIALIZATION = false ]; then
     #read_inc and iau tests restart from fh=24
     CURRDIR=`pwd`