Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v12: Fix lazy sed for RRTMGP #696

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gcm_forecast.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ endif
set instance_files = `/bin/ls -1 *_instance*.rc`
foreach instance ($instance_files)
/bin/mv $instance $instance.tmp
cat $instance.tmp | sed -e '/RRTMG/ s#RRTMG#RRTMGP#' > $instance
cat $instance.tmp | sed -e '/\bRRTMG\b/ s#RRTMG#RRTMGP#' > $instance
/bin/rm $instance.tmp
end

Expand Down
2 changes: 1 addition & 1 deletion gcm_regress.j
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ endif
set instance_files = `/bin/ls -1 *_instance*.rc`
foreach instance ($instance_files)
/bin/mv $instance $instance.tmp
cat $instance.tmp | sed -e '/RRTMG/ s#RRTMG#RRTMGP#' > $instance
cat $instance.tmp | sed -e '/\bRRTMG\b/ s#RRTMG#RRTMGP#' > $instance
/bin/rm $instance.tmp
end

Expand Down
2 changes: 1 addition & 1 deletion gcm_run.j
Original file line number Diff line number Diff line change
Expand Up @@ -854,7 +854,7 @@ endif
set instance_files = `/bin/ls -1 *_instance*.rc`
foreach instance ($instance_files)
/bin/mv $instance $instance.tmp
cat $instance.tmp | sed -e '/RRTMG/ s#RRTMG#RRTMGP#' > $instance
cat $instance.tmp | sed -e '/\bRRTMG\b/ s#RRTMG#RRTMGP#' > $instance
/bin/rm $instance.tmp
end

Expand Down
8 changes: 4 additions & 4 deletions gcm_run.j-new_rst_approach
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ if($numrs == 0) then
set ext = bin
else
set ext = nc4
endif
endif
if( -e $rst & ! -e ${EXPDIR}/restarts/$EXPID.${rst}.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}.$ext ) then
cp $rst ${EXPDIR}/restarts/$EXPID.${rst}.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}.$ext &
endif
Expand Down Expand Up @@ -851,7 +851,7 @@ endif
set instance_files = `/bin/ls -1 *_instance*.rc`
foreach instance ($instance_files)
/bin/mv $instance $instance.tmp
cat $instance.tmp | sed -e '/RRTMG/ s#RRTMG#RRTMGP#' > $instance
cat $instance.tmp | sed -e '/\bRRTMG\b/ s#RRTMG#RRTMGP#' > $instance
/bin/rm $instance.tmp
end

Expand Down Expand Up @@ -1098,7 +1098,7 @@ endif
echo OMP_NUM_THREADS $OMP_NUM_THREADS

~/bin/strip GWD_GridComp.rc
if (${OMP_NUM_THREADS} > 1) then
if (${OMP_NUM_THREADS} > 1) then
sed -i -e "s|FALSE|TRUE|g" GWD_GridComp.rc
endif

Expand Down Expand Up @@ -1228,7 +1228,7 @@ echo "RH_WEIGHTS_DIR: $RH_WEIGHTS_DIR"
if (! -e $RH_WEIGHTS_DIR ) mkdir -p $RH_WEIGHTS_DIR
set rh_files = `/bin/ls -1 *rh_*method*`
foreach rh_file ($rh_files)
if (! -e $RH_WEIGHTS_DIR/$rh_file) /bin/mv $rh_file $RH_WEIGHTS_DIR/$rh_file
if (! -e $RH_WEIGHTS_DIR/$rh_file) /bin/mv $rh_file $RH_WEIGHTS_DIR/$rh_file
end

#######################################################################
Expand Down
2 changes: 1 addition & 1 deletion gcm_run_benchmark.j
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,7 @@ endif
set instance_files = `/bin/ls -1 *_instance*.rc`
foreach instance ($instance_files)
/bin/mv $instance $instance.tmp
cat $instance.tmp | sed -e '/RRTMG/ s#RRTMG#RRTMGP#' > $instance
cat $instance.tmp | sed -e '/\bRRTMG\b/ s#RRTMG#RRTMGP#' > $instance
/bin/rm $instance.tmp
end

Expand Down