Organize input data

NickSzapiro-NOAA · Aug 16, 2024 · 16f07f4 · 16f07f4
1 parent af58885
commit 16f07f4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/tests/fv3_conf/cpld_control_run.IN b/tests/fv3_conf/cpld_control_run.IN
@@ -18,8 +18,8 @@ ICERES=${OCNRES:0:1}.${OCNRES:1}
 V2_SFC_FILE=${V2_SFC_FILE:-false}
 
 if [[ $BMIC == .true. ]]; then
-  #FV3_IC=@[INPUTDATA_ROOT_BMIC]/gefs/${SYEAR}${SMONTH}${SDAY}${SHOUR}/
-  FV3_IC=@[INPUTDATA_ROOT_BMIC] #TODO: testing
+  #FV3_IC=@[INPUTDATA_ROOT]/GEFS/${SYEAR}${SMONTH}${SDAY}${SHOUR}/ #TODO: testing
+  FV3_IC=/scratch1/NCEPDEV/nems/Nick.Szapiro/tasks/input_data/gefs.v13/stage/GEFS/${SYEAR}${SMONTH}${SDAY}${SHOUR}/
   MOM_IC=${FV3_IC}; ICE_IC=${FV3_IC}; WAV_IC=${FV3_IC}
 else
   if [[ $ATMRES == C48 ]]; then
@@ -224,7 +224,8 @@ if [ $IAER = 2011 ]; then
   cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_DU.v15_3.dat optics_DU.dat
   cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SS.v3_3.dat  optics_SS.dat
   cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SU.v1_3.dat  optics_SU.dat
-  DIR_OPT=/scratch1/NCEPDEV/nems/Nick.Szapiro/tasks/input_data/gefs.v13/CHM/ExtData/monochromatic/
+
+  DIR_OPT=/scratch1/NCEPDEV/nems/Nick.Szapiro/tasks/input_data/gefs.v13/stage/GEFS/ExtData/monochromatic/
   cp ${DIR_OPT}/optics_BC.v1_3.nc  optics_BC.nc
   cp ${DIR_OPT}/optics_OC.v1_3.nc  optics_OC.nc 
   cp ${DIR_OPT}/optics_DU.v15_3.nc optics_DU.nc
@@ -248,8 +249,7 @@ fi
 #prognostic aerosols
 if [ $CPLCHM = .true. ]; then
   if [[ $BMIC == .true. ]]; then
-    #ln -sf /scratch1/NCEPDEV/nems/Nick.Szapiro/tasks/input_data/gefs.v13/CHM/ExtData .
-    ln -sf /scratch1/NCEPDEV/global/glopara/data/gocart_emissions ExtData
+    ln -sf /scratch1/NCEPDEV/nems/Nick.Szapiro/tasks/input_data/gefs.v13/stage/GEFS/ExtData . 
   else
     ln -sf  @[INPUTDATA_ROOT]/GOCART/p8c_5d/ExtData .
   fi

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -1020,9 +1020,7 @@ fi
 
 INPUTDATA_ROOT=${INPUTDATA_ROOT:-${DISKNM}/NEMSfv3gfs/input-data-20240501}
 #INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20240214
-INPUTDATA_ROOT_WW3=/scratch1/NCEPDEV/nems/Nick.Szapiro/tasks/updateToEP5/WW3_inputdata
-#INPUTDATA_ROOT_BMIC=${INPUTDATA_ROOT_BMIC:-${DISKNM}/NEMSfv3gfs/BM_IC-20220207}
-INPUTDATA_ROOT_BMIC=/scratch1/NCEPDEV/nems/Nick.Szapiro/tasks/input_data/gefs.v13/IC
+INPUTDATA_ROOT_WW3=/scratch1/NCEPDEV/nems/Nick.Szapiro/tasks/input_data/gefs.v13/stage/WW3_input_data
 
 shift $((OPTIND-1))
 if [[ $# -gt 1 ]]; then