Merge branch 'develop' into feature/dev-wcoss2

* develop: Remove SDATE=CDATE IAU block in NCO config.base (#963) Updates for P8 (#946) Fix GLDAS j-job link (#954) Add ocean post to archive dependencies (#949)
NOAA-EMC · Aug 4, 2022 · 9ce7ee6 · 9ce7ee6
2 parents 2c24858 + 1026b2c
commit 9ce7ee6
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 13 deletions.
diff --git a/parm/chem/ExtData.other b/parm/chem/ExtData.other
@@ -11,12 +11,12 @@ TROPP            'Pa'    Y       N                  -            0.0      1.0
 DU_SRC            NA  N Y - none none du_src     ExtData/Dust/gocart.dust_source.v5a.x1152_y721.nc
 
 # FENGSHA input files. Note: regridding should be N or E - Use files with _FillValue != NaN 
-DU_CLAY           '1'  Y E           -           none none clayfrac    ExtData/Dust/FENGSHA_SOILGRIDS2019_GEFSv12_v1.2.nc
-DU_SAND           '1'  Y E           -           none none sandfrac    ExtData/Dust/FENGSHA_SOILGRIDS2019_GEFSv12_v1.2.nc
+DU_CLAY           '1'  Y E           -           none none clayfrac    ExtData/Dust/FENGSHA_p81_10km_inputs.nc
+DU_SAND           '1'  Y E           -           none none sandfrac    ExtData/Dust/FENGSHA_p81_10km_inputs.nc
 DU_SILT           '1'  Y E           -           none none siltfrac    /dev/null
 DU_SSM            '1'  Y E           -           none none ssm         /dev/null:1.0
-DU_RDRAG          '1'  Y E %y4-%m2-%d2t12:00:00  none none albedo_drag ExtData/Dust/FENGSHA_Albedo_drag_v1.nc
-DU_UTHRES         '1'  Y E           -           none none uthres      ExtData/Dust/randomforestensemble_uthres.nc
+DU_RDRAG          '1'  Y E %y4-%m2-%d2t12:00:00  none none albedo_drag ExtData/Dust/FENGSHA_p81_10km_inputs.nc
+DU_UTHRES         '1'  Y E           -           none none uthres      ExtData/Dust/FENGSHA_p81_10km_inputs.nc
 
 #====== Sulfate Sources =================================================
 # Anthropogenic (BF & FF) emissions -- allowed to input as two layers

diff --git a/parm/config/config.aero b/parm/config/config.aero
@@ -25,7 +25,7 @@ AERO_EMIS_FIRE=QFED
 # Aerosol convective scavenging factors (list of string array elements)
 # Element syntax: '<tracer_name>:<factor>'. Use <tracer_name> = * to set default factor for all aerosol tracers
 # Scavenging factors are set to 0 (no scavenging) if unset
-aero_conv_scav_factors="'*:0.3','so2:0.0','msa:0.0','dms:0.0','nh3:0.4','nh4:0.6','bc1:0.6','bc2:0.6','dust1:0.6','dust2:0.6', 'dust3:0.6','dust4:0.6','dust5:0.6','seas1:0.5','seas2:0.5','seas3:0.5','seas4:0.5','seas5:0.5'"
+aero_conv_scav_factors="'*:0.3','so2:0.0','msa:0.0','dms:0.0','nh3:0.4','nh4:0.6','bc1:0.6','bc2:0.6','oc1:0.4','oc2:0.4','dust1:0.6','dust2:0.6', 'dust3:0.6','dust4:0.6','dust5:0.6','seas1:0.5','seas2:0.5','seas3:0.5','seas4:0.5','seas5:0.5'"
 #
 # Number of diagnostic aerosol tracers (default: 0)
 aero_diag_tracers=2
diff --git a/parm/config/config.base.nco.static b/parm/config/config.base.nco.static
@@ -194,10 +194,6 @@ export IAU_OFFSET=6
 export DOIAU_ENKF=${DOIAU:-"YES"}   # Enable 4DIAU for EnKF ensemble
 export IAUFHRS_ENKF="3,6,9"
 export IAU_DELTHRS_ENKF=6
-if [[ "$SDATE" = "$CDATE" ]]; then
-  export IAU_OFFSET=0
-  export IAU_FHROT=0
-fi
 
 # Use Jacobians in eupd and thereby remove need to run eomg
 export lobsdiag_forenkf=".true."

diff --git a/parm/config/config.fcst b/parm/config/config.fcst
@@ -122,7 +122,7 @@ if [ $gwd_opt -eq 2 ]; then
     #export  do_gsl_drag_tofd=".true."
     #export  do_ugwp_v1_orog_only=".false."
 
-    #--used for UFS p8b 
+    #--used for UFS p8 
     export knob_ugwp_version=0
     export do_ugwp=".false."
     export do_tofd=".false."
@@ -132,7 +132,7 @@ if [ $gwd_opt -eq 2 ]; then
     export do_ugwp_v0_nst_only=".false."
     export do_gsl_drag_ls_bl=".false."
     export do_gsl_drag_ss=".true."
-    export do_gsl_drag_tofd=".true."
+    export do_gsl_drag_tofd=".false."
     export do_ugwp_v1_orog_only=".false."
     export launch_level=$(echo "$LEVS/2.35" |bc)
 fi

diff --git a/sorc/checkout.sh b/sorc/checkout.sh
@@ -106,7 +106,7 @@ CHECKOUT_GSI="NO"
 CHECKOUT_GDAS="NO"
 checkout_gtg="NO"
 checkout_wafs="NO"
-ufs_model_hash="b97375c"
+ufs_model_hash="Prototype-P8"
 
 # Parse command line arguments
 while getopts ":chgum:o" option; do

diff --git a/sorc/link_workflow.sh b/sorc/link_workflow.sh
@@ -81,8 +81,8 @@ fi
 #---------------------------------------
 #--add files from external repositories
 #---------------------------------------
+cd ${pwd}/../jobs               ||exit 8
 if [ -d ../sorc/gldas.fd ]; then
-  cd ${pwd}/../jobs               ||exit 8
     $LINK ../sorc/gldas.fd/jobs/JGDAS_ATMOS_GLDAS            .
 fi
 cd ${pwd}/../parm               ||exit 8

diff --git a/workflow/rocoto/workflow_tasks.py b/workflow/rocoto/workflow_tasks.py
@@ -905,6 +905,9 @@ def arch(self):
             if self.app_config.do_wave_bnd:
                 dep_dict = {'type': 'task', 'name': f'{self.cdump}wavepostbndpnt'}
                 deps.append(rocoto.add_dependency(dep_dict))
+        if self.app_config.do_ocean:
+            dep_dict = {'type': 'metatask', 'name': f'{self.cdump}ocnpost'}
+            deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         resources = self.get_resource('arch')