Skip to content
Draft
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
14 changes: 12 additions & 2 deletions gcm_run.j
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,7 @@ endif
#ln -sf $SSTDIR/dataoceanfile_MERRA2_SST.${OGCM_IM}x${OGCM_JM}.${yy}.data sst.data
#ln -sf $SSTDIR/dataoceanfile_MERRA2_ICE.${OGCM_IM}x${OGCM_JM}.${yy}.data fraci.data

@CICE6 #detect exisistence of certain fields in CICE6 restart
@CICE6 #detect existence of certain fields in CICE6 restart
@CICE6 ncdump -h INPUT/iced.nc | grep 'apnd' > /dev/null
@CICE6 if( $status == 0 ) then
@CICE6 echo 'pond state in restart, turn on restart flag if not already'
Expand Down Expand Up @@ -1092,12 +1092,22 @@ endif
@SINGULARITY_BUILD @OCEAN_PRELOAD $RUN_CMD $TOTAL_PES $SINGULARITY_RUN $GEOSEXE $IOSERVER_OPTIONS $IOSERVER_EXTRA --logging_config 'logging.yaml'
@NATIVE_BUILD @OCEAN_PRELOAD @SEVERAL_TRIES $RUN_CMD $TOTAL_PES $GEOSEXE $IOSERVER_OPTIONS $IOSERVER_EXTRA --logging_config 'logging.yaml'

# Capture the return code from GEOSgcm.x
# --------------------------------------
set run_status = $status

if ($run_status != 0) then
echo "GEOSgcm.x failed with return code $run_status"
exit $run_status
endif

if( $USE_SHMEM == 1 ) $GEOSBIN/RmShmKeys_sshmpi.csh >& /dev/null

if( -e EGRESS ) then
set rc = 0
else
set rc = -1
echo "EGRESS file not found, GEOSgcm.x likely failed"
exit 9
endif
echo GEOSgcm Run Status: $rc

Expand Down