diff --git a/rrfs-test/scripts/link_mpasjedi_expr.sh b/rrfs-test/scripts/link_mpasjedi_expr.sh index 941209f..51794f4 100755 --- a/rrfs-test/scripts/link_mpasjedi_expr.sh +++ b/rrfs-test/scripts/link_mpasjedi_expr.sh @@ -29,10 +29,10 @@ cp ${RDASApp}/sorc/mpas-jedi/test/testinput/namelists/geovars.yaml . cp ${RDASApp}/rrfs-test/testinput/bumploc.yaml . cp ${RDASApp}/rrfs-test/testinput/namelist.atmosphere . cp ${RDASApp}/rrfs-test/testinput/streams.atmosphere . -cp ${RDASApp}/rrfs-test/testinput/rrfs_mpasjedi_2024052700_Ens3Dvar_sonde_singleob.yaml . +cp ${RDASApp}/rrfs-test/testinput/rrfs_mpasjedi_2024052700_Ens3Dvar.yaml . if [[ "${exprname}" == "atl_2024052700" ]]; then sed -i -e "s/conus12km_mpas.graph/atl12km.graph/" ./namelist.atmosphere - sed -i -e "s/conus12km-401km11levels/atl12km-401km11levels/" ./rrfs_mpasjedi_2024052700_Ens3Dvar_sonde_singleob.yaml + sed -i -e "s/conus12km-401km11levels/atl12km-401km11levels/" ./rrfs_mpasjedi_2024052700_Ens3Dvar.yaml fi sed -e "s#@RDASApp@#${RDASApp}#" ${RDASApp}/rrfs-test/scripts/templates/mpasjedi_expr/run_bump.sh > run_bump.sh sed -e "s#@RDASApp@#${RDASApp}#" ${RDASApp}/rrfs-test/scripts/templates/mpasjedi_expr/run_jedi.sh > run_jedi.sh diff --git a/rrfs-test/scripts/setup_experiment.sh b/rrfs-test/scripts/setup_experiment.sh index c0cf428..982d63a 100755 --- a/rrfs-test/scripts/setup_experiment.sh +++ b/rrfs-test/scripts/setup_experiment.sh @@ -89,7 +89,7 @@ elif [[ $DYCORE == "MPAS" ]]; then cp -rp ${RDAS_DATA}/fix/stream_list/* stream_list/ cp ${YOUR_PATH_TO_RDASAPP}/rrfs-test/testinput/bumploc.yaml . cp ${YOUR_PATH_TO_RDASAPP}/rrfs-test/testinput/namelist.atmosphere . - cp ${YOUR_PATH_TO_RDASAPP}/rrfs-test/testinput/rrfs_mpasjedi_2024052700_Ens3Dvar_sonde_singleob.yaml . + cp ${YOUR_PATH_TO_RDASAPP}/rrfs-test/testinput/rrfs_mpasjedi_2024052700_Ens3Dvar.yaml . cp ${YOUR_PATH_TO_RDASAPP}/rrfs-test/testinput/streams.atmosphere . cp ${YOUR_PATH_TO_RDASAPP}/sorc/mpas-jedi/test/testinput/obsop_name_map.yaml . cp ${YOUR_PATH_TO_RDASAPP}/sorc/mpas-jedi/test/testinput/namelists/keptvars.yaml . diff --git a/rrfs-test/scripts/templates/mpasjedi_expr/run_jedi.sh b/rrfs-test/scripts/templates/mpasjedi_expr/run_jedi.sh index 80c9217..ee96cb9 100755 --- a/rrfs-test/scripts/templates/mpasjedi_expr/run_jedi.sh +++ b/rrfs-test/scripts/templates/mpasjedi_expr/run_jedi.sh @@ -12,7 +12,7 @@ RDASApp=@RDASApp@ -inputfile=./rrfs_mpasjedi_2024052700_Ens3Dvar_sonde_singleob.yaml +inputfile=./rrfs_mpasjedi_2024052700_Ens3Dvar.yaml . /apps/lmod/lmod/init/sh @@ -30,3 +30,4 @@ ulimit -v unlimited ulimit -a srun -l -n 120 ${RDASApp}/build/bin/mpasjedi_variational.x ./$inputfile log.out +#srun -l -n 120 ${RDASApp}/build/bin/mpasjedi_enkf.x ./$inputfile log.out diff --git a/rrfs-test/scripts/templates/run_mpasjedi_template.sh b/rrfs-test/scripts/templates/run_mpasjedi_template.sh index 814a701..4269a55 100755 --- a/rrfs-test/scripts/templates/run_mpasjedi_template.sh +++ b/rrfs-test/scripts/templates/run_mpasjedi_template.sh @@ -32,10 +32,11 @@ module list inputfile=$1 if [[ $inputfile == "" ]]; then - inputfile=./rrfs_mpasjedi_2024052700_Ens3Dvar_sonde_singleob.yaml + inputfile=./rrfs_mpasjedi_2024052700_Ens3Dvar.yaml fi jedibin="@YOUR_PATH_TO_RDASAPP@/build/bin" # Run JEDI - currently cannot change processor count srun -l -n 120 $jedibin/mpasjedi_variational.x ./$inputfile out.log +#srun -l -n 120 $jedibin/mpasjedi_enkf.x ./$inputfile out.log diff --git a/rrfs-test/testinput/rrfs_mpasjedi_2024052700_Ens3Dvar_sonde_singleob.yaml b/rrfs-test/testinput/rrfs_mpasjedi_20240527_Ens3Dvar.yaml similarity index 100% rename from rrfs-test/testinput/rrfs_mpasjedi_2024052700_Ens3Dvar_sonde_singleob.yaml rename to rrfs-test/testinput/rrfs_mpasjedi_20240527_Ens3Dvar.yaml