clean up for PR

docs/source/clone.rst

@@ -39,6 +39,13 @@ For coupled cycling (include new UFSDA) use the `-gu` options during build:
    ./build_all.sh -gu
 
 
+For building with PDLIB for the wave model, use the `-w` options during build:
+
+::
+
+   ./build_all.sh -w
+
+
 Build workflow components and link workflow artifacts such as executables, etc.
 
 ::

parm/config/gfs/config.base.emc.dyn

@@ -47,9 +47,7 @@ export PACKAGEROOT="@PACKAGEROOT@"    # TODO: set via prod_envir in Ops
 export COMROOT="@COMROOT@"    # TODO: set via prod_envir in Ops
 export COMINsyn="@COMINsyn@"
 export DMPDIR="@DMPDIR@"
-#export BASE_CPLIC="@BASE_CPLIC@"
-export BASE_CPLIC="/lfs/h2/emc/couple/noscrub/jessica.meixner/HR3/IC"
-#export BASE_CPLIC="/work2/noaa/marine/jmeixner/HR3/HR2_refactored_IC"
+export BASE_CPLIC="@BASE_CPLIC@"
 
 # USER specific paths
 export HOMEDIR="@HOMEDIR@"
@@ -184,17 +182,15 @@ export ICERES="${OCNRES}"
 # These are the currently recommended grid-combinations
 case "${CASE}" in
     "C48")
-        export waveGRD='glo_500'
         export waveGRD='uglo_100km'
         ;;
     "C96" | "C192")
-        export waveGRD='glo_200'
+        export waveGRD='uglo_100km'
         ;;
     "C384")
-        export waveGRD='glo_025'
+        export waveGRD='uglo_m1g16'
         ;;
     "C768" | "C1152")
-        export waveGRD='mx025'
 	export waveGRD='uglo_m1g16'
         ;;
     *)
@@ -267,7 +263,7 @@ export FHMAX_GFS_12=120
 export FHMAX_GFS_18=120
 current_fhmax_var=FHMAX_GFS_${cyc}; declare -x FHMAX_GFS=${!current_fhmax_var}
 
-export FHOUT_GFS=3 # Must be 6 for S2S until #1629 is addressed; 3 for ops
+export FHOUT_GFS=6 # Must be 6 for S2S until #1629 is addressed; 3 for ops
 export FHMAX_HF_GFS=0
 export FHOUT_HF_GFS=1
 if (( gfs_cyc != 0 )); then

parm/config/gfs/config.fcst

@@ -31,7 +31,7 @@ if [[ "${DONST}" == "YES" ]]; then
     source "${EXPDIR}/config.nsst"
 fi
 
-export esmf_profile=".true."
+export esmf_profile=".false."
 export esmf_logkind="ESMF_LOGKIND_MULTI_ON_ERROR" #Options: ESMF_LOGKIND_MULTI_ON_ERROR, ESMF_LOGKIND_MULTI, ESMF_LOGKIND_NONE
 
 

parm/config/gfs/config.stage_ic

@@ -21,16 +21,16 @@ case "${CASE}" in
     export CPL_WAVIC=workflow_C384_refactored
     ;;
   "C768")
-    export CPL_ATMIC=TestHR23_768
-    export CPL_ICEIC=TestHR23_768
-    export CPL_OCNIC=TestHR23_768
-    export CPL_WAVIC=TestHR23_768
+    export CPL_ATMIC=HR2_refactored
+    export CPL_ICEIC=HR1_refactored
+    export CPL_OCNIC=HR1_refactored
+    export CPL_WAVIC=HR1_refactored
     ;;
   "C1152")
-    export CPL_ATMIC=TestHR23_C1152
-    export CPL_ICEIC=TestHR23_C1152
-    export CPL_OCNIC=TestHR23_C1152
-    export CPL_WAVIC=TestHR23_C1152
+    export CPL_ATMIC=HR2_C1152_refactored
+    export CPL_ICEIC=HR3_refactored
+    export CPL_OCNIC=HR3_refactored
+    export CPL_WAVIC=HR1_refactored
     ;;
   *)
     echo "FATAL ERROR Unrecognized resolution: ${CASE}"

parm/config/gfs/config.ufs

@@ -15,7 +15,7 @@ if (( $# <= 1 )); then
     echo "--fv3 C48|C96|C192|C384|C768|C1152|C3072"
     echo "--mom6 500|100|025"
     echo "--cice6 500|100|025"
-    echo "--ww3 gnh_10m;aoc_9km;gsh_15m|gwes_30m|glo_025|glo_200|glo_500|mx025|uglo_100km|uglo_20km|uglo_15km|uglo_m1g16"
+    echo "--ww3 gnh_10m;aoc_9km;gsh_15m|gwes_30m|glo_025|glo_200|glo_500|mx025|uglo_100km|uglo_m1g16"
     echo "--gocart"
 
     exit 1
@@ -468,14 +468,6 @@ if [[ "${skip_ww3}" == "false" ]]; then
       ntasks_ww3=40
       nthreads_ww3=1
       ;;
-    "uglo_20km")
-      ntasks_ww3=2000
-      nthreads_ww3=1
-      ;;	    
-    "uglo_15km")    
-      ntasks_ww3=2000
-      nthreads_ww3=1
-      ;;
     "uglo_m1g16")  
       ntasks_ww3=2000
       nthreads_ww3=1

parm/config/gfs/config.wave

@@ -86,18 +86,6 @@ case "${waveGRD}" in
     export wavepostGRD=''
     export waveuoutpGRD=${waveGRD}
     ;;
-  "uglo_20km")
-    #unstructured 20km grid 
-    export waveinterpGRD='glo_15mxt'
-    export wavepostGRD=''
-    export waveuoutpGRD=${waveGRD}
-    ;;
-  "uglo_15km")
-    #unstructured 15km grid 
-    export waveinterpGRD='glo_15mxt'
-    export wavepostGRD=''
-    export waveuoutpGRD=${waveGRD}
-    ;;
   "uglo_m1g16")
     #unstructured m1v16 grid 
     export waveinterpGRD='glo_15mxt'

parm/ufs/fv3/diag_table

@@ -1,6 +1,6 @@
 "fv3_history",    0,  "hours",  1,  "hours",  "time"
 "fv3_history2d",  0,  "hours",  1,  "hours",  "time"
-"ocn%4yr%2mo%2dy%2hr",    3,  "hours",  1,  "hours",  "time",  3,  "hours",  "1901 1 1 0 0 0"
+"ocn%4yr%2mo%2dy%2hr",    6,  "hours",  1,  "hours",  "time",  6,  "hours",  "1901 1 1 0 0 0"
 "ocn_daily%4yr%2mo%2dy",  1,  "days",   1,  "days",   "time",  1,  "days",   "1901 1 1 0 0 0"
 
 ##############