Closing input and output diffs to EP5 control

NickSzapiro-NOAA · Jun 18, 2024 · dfa5f5f · dfa5f5f
1 parent a89de00
commit dfa5f5f
Show file tree

Hide file tree

Showing 8 changed files with 11,409 additions and 16 deletions.
diff --git a/tests/fv3_conf/cpld_control_run.IN b/tests/fv3_conf/cpld_control_run.IN
@@ -88,12 +88,14 @@ if [ $WARM_START = .false. ]; then
  cp ${FV3_IC}/gfs_ctrl.nc ./INPUT
  if [[ $BMIC == .true. ]]; then
  cp ${MOM_IC}/MOM*.nc ./INPUT
+ cp ${MOM_IC}/ORAS5.mx025.ic.nc ./INPUT
+ cp ${MOM_IC}/interpolate_zgrid_26L.nc ./INPUT
  #cp ${ICE_IC}/cice5_model_@[ICERES].res_${SYEAR}${SMONTH}${SDAY}00.nc ./cice_model.res.nc
  cp ${ICE_IC}/cice*nc ./INPUT
  ls -1 ./INPUT/cice*nc>ice.restart_file
  cp ${FV3_IC}/ufs.cpld.cpl*nc .
  ls -1 ufs.cpld.cpl*nc>rpointer.cpl
- cp ${WAV_IC}/restart.ww3 ufs.cpld.ww3.r.2021-03-22-21600
+ cp ${WAV_IC}/restart.ww3 ufs.cpld.ww3.r.${RESTART_FILE_SUFFIX_SECS}
  else
  if [[ $ATMRES == C48 ]]; then
  cp ${MOM_IC}/MOM.res.nc ./INPUT
@@ -169,6 +171,8 @@ else
  cp ${FV3_IC}/sfc_data*.nc ./INPUT
  #coupler.res fv_core.res.nc fv_core.res.tile[1-6].nc fv_srf_wnd.res.tile[1-6].nc fv_tracer.res.tile[1-6].nc
  cp ${MOM_IC}/MOM*.nc ./INPUT
+ cp ${MOM_IC}/ORAS5.mx025.ic.nc ./INPUT
+ cp ${MOM_IC}/interpolate_zgrid_26L.nc ./INPUT
  cp ${ICE_IC}/cice*nc ./INPUT
  ls -1 ./INPUT/cice*nc>ice.restart_file
  cp ${FV3_IC}/ufs.cpld.cpl*nc .
@@ -186,10 +190,17 @@ fi
 
 #inline post
 if [ $WRITE_DOPOST = .true. ]; then
- cp ${PATHRT}/parm/post_itag_gfs itag
- cp ${PATHRT}/parm/postxconfig-NT-gfs.txt postxconfig-NT.txt
- cp ${PATHRT}/parm/postxconfig-NT-gfs_FH00.txt postxconfig-NT_FH00.txt
- cp ${PATHRT}/parm/params_grib2_tbl_new params_grib2_tbl_new
+ if [[ $BMIC == .true. ]]; then
+ cp ${PATHRT}/parm/post_itag_gefs itag
+ cp ${PATHRT}/parm/postxconfig-NT-gefs.txt postxconfig-NT.txt
+ cp ${PATHRT}/parm/postxconfig-NT-gefs_FH00.txt postxconfig-NT_FH00.txt
+ cp ${PATHRT}/parm/params_grib2_tbl_new params_grib2_tbl_new
+ else
+ cp ${PATHRT}/parm/post_itag_gfs itag
+ cp ${PATHRT}/parm/postxconfig-NT-gfs.txt postxconfig-NT.txt
+ cp ${PATHRT}/parm/postxconfig-NT-gfs_FH00.txt postxconfig-NT_FH00.txt
+ cp ${PATHRT}/parm/params_grib2_tbl_new params_grib2_tbl_new
+ fi
 fi
 
 #merra2
@@ -206,6 +217,9 @@ fi
 
 #rad_c_gocart
 if [ $IAER = 2011 ]; then
+ for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
+ cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2_y14_24/merra2_1423_${n}.nc aeroclim.m${n}.nc
+ done
  cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat optics_BC.dat
  cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_OC.v1_3.dat optics_OC.dat
  cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_DU.v15_3.dat optics_DU.dat

diff --git a/tests/parm/MOM_input_025.IN b/tests/parm/MOM_input_025.IN
@@ -198,7 +198,7 @@ DTFREEZE_DP = -7.75E-08 ! [deg C Pa-1] default = 0.0
  ! temperature with pressure.
 
 ! === module MOM_restart ===
-PARALLEL_RESTARTFILES = True  ! [Boolean] default = False
+PARALLEL_RESTARTFILES = False ! [Boolean] default = False
  ! If true, each processor writes its own restart file, otherwise a single
  ! restart file is generated
 
@@ -308,9 +308,16 @@ REMAPPING_SCHEME = "PPM_H4" ! default = "PLM"
 ! Parameters providing information about the lateral grid.
 
 ! === module MOM_state_initialization ===
-INIT_LAYERS_FROM_Z_FILE = True  ! [Boolean] default = False
+INIT_LAYERS_FROM_Z_FILE = False ! [Boolean] default = False
  ! If true, initialize the layer thicknesses, temperatures, and salinities from a
  ! Z-space file on a latitude-longitude grid.
+THICKNESS_CONFIG = "thickness_file"
+THICKNESS_FILE = "ORAS5.mx025.ic.nc"
+TS_CONFIG = "file"
+TS_FILE = "ORAS5.mx025.ic.nc"
+TEMP_IC_VAR = "Temp"
+VELOCITY_CONFIG = "file"
+VELOCITY_FILE = "ORAS5.mx025.ic.nc"
 
 ! === module MOM_initialize_layers_from_Z ===
 TEMP_SALT_Z_INIT_FILE = "MOM6_IC_TS.nc" ! default = "temp_salt_z.nc"

diff --git a/tests/parm/gocart/DU2G_instance_DU.rc b/tests/parm/gocart/DU2G_instance_DU.rc
@@ -43,6 +43,6 @@ emission_scheme: fengsha # choose among: fengsha, ginoux, k14
 # FENGSHA settings
 alpha: 0.1
 gamma: 1.0
-soil_moisture_factor: 1.0
-soil_drylimit_factor: 1.0
+soil_moisture_factor: 1
+soil_drylimit_factor: 1
 vertical_to_horizontal_flux_ratio_limit: 2.e-04
diff --git a/tests/parm/gocart/GOCART2G_GridComp.rc b/tests/parm/gocart/GOCART2G_GridComp.rc
@@ -39,3 +39,5 @@ PASSIVE_INSTANCES_NI:
 aerosol_monochromatic_optics_wavelength_in_nm_from_LUT: 470 550 670 870
 wavelengths_for_profile_aop_in_nm: 470 550 670 870 # must be included in LUT
 wavelengths_for_vertically_integrated_aop_in_nm: 470 550 670 870 # must be included in LUT
+
+use_threads: .TRUE.
diff --git a/tests/parm/post_itag_gefs b/tests/parm/post_itag_gefs
@@ -0,0 +1,7 @@
+&MODEL_INPUTS
+MODELNAME='GFS'
+/
+&NAMPGB
+ KPO=50,PO=1000.,975.,950.,925.,900.,875.,850.,825.,800.,775.,750.,725.,700.,675.,650.,625.,600.,575.,550.,525.,500.,475.,450.,425.,400.,375.,350.,325.,300.,275.,250.,225.,200.,175.,150.,125.,100.,70.,50.,40.,30.,20.,15.,10.,7.,5.,3.,2.,1.,0.4,
+ /
+EOF