Skip to content

Commit 211cd06

Browse files
mathomp4mathomp4
committed
v12: Remove saltwater splitting
1 parent e052943 commit 211cd06

File tree

5 files changed

+0
-245
lines changed

5 files changed

+0
-245
lines changed

‎gcm_forecast.tmpl‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -717,60 +717,6 @@ endif
717717
#ln -sf $SSTDIR/dataoceanfile_MERRA2_SST.${OGCM_IM}x${OGCM_JM}.${yy}.data sst.data
718718
#ln -sf $SSTDIR/dataoceanfile_MERRA2_ICE.${OGCM_IM}x${OGCM_JM}.${yy}.data fraci.data
719719

720-
#######################################################################
721-
# Split Saltwater Restart if detected
722-
#######################################################################
723-
724-
if ( (-e $SCRDIR/openwater_internal_rst) && (-e $SCRDIR/seaicethermo_internal_rst)) then
725-
echo "Saltwater internal state is already split, good to go!"
726-
else
727-
if ( ( -e $SCRDIR/saltwater_internal_rst ) || ( -e $EXPDIR/saltwater_internal_rst) ) then
728-
729-
echo "Found Saltwater internal state. Splitting..."
730-
731-
# If saltwater_internal_rst is in EXPDIR move to SCRDIR
732-
# -----------------------------------------------------
733-
if ( -e $EXPDIR/saltwater_internal_rst ) /bin/mv $EXPDIR/saltwater_internal_rst $SCRDIR
734-
735-
# The splitter script requires an OutData directory
736-
# -------------------------------------------------
737-
if (! -d OutData ) mkdir -p OutData
738-
739-
# Run the script
740-
# --------------
741-
@SINGULARITY_BUILD $RUN_CMD 1 $SINGULARITY_RUN $GEOSBIN/SaltIntSplitter tile.data $SCRDIR/saltwater_internal_rst
742-
@NATIVE_BUILD $RUN_CMD 1 $GEOSBIN/SaltIntSplitter tile.data $SCRDIR/saltwater_internal_rst
743-
744-
# Move restarts
745-
# -------------
746-
/bin/mv OutData/openwater_internal_rst OutData/seaicethermo_internal_rst .
747-
748-
# Remove OutData
749-
# --------------
750-
/bin/rmdir OutData
751-
752-
# Make decorated copies for restarts tarball
753-
# ------------------------------------------
754-
cp openwater_internal_rst $EXPID.openwater_internal_rst.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}
755-
cp seaicethermo_internal_rst $EXPID.seaicethermo_internal_rst.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}
756-
757-
# Inject decorated copies into restarts tarball
758-
# ---------------------------------------------
759-
tar rf $EXPDIR/restarts/restarts.${edate}.tar $EXPID.*.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}
760-
761-
# Remove the decorated restarts
762-
# -----------------------------
763-
/bin/rm $EXPID.*.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}
764-
765-
# Remove the saltwater internal restart
766-
# -------------------------------------
767-
/bin/rm $SCRDIR/saltwater_internal_rst
768-
else
769-
echo "Neither saltwater_internal_rst, nor openwater_internal_rst and seaicethermo_internal_rst were found. Abort!"
770-
exit 6
771-
endif
772-
endif
773-
774720
# Test Openwater Restart for Number of tiles correctness
775721
# ------------------------------------------------------
776722

‎gcm_regress.j‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -199,34 +199,6 @@ endif
199199

200200
if(! -e tile.bin) $GEOSBIN/binarytile.x tile.data tile.bin
201201

202-
#######################################################################
203-
# Split Saltwater Restart if detected
204-
#######################################################################
205-
206-
if ( (-e $EXPDIR/regress/openwater_internal_rst) && (-e $EXPDIR/regress/seaicethermo_internal_rst)) then
207-
echo "Saltwater internal state is already split, good to go!"
208-
else
209-
if ( -e $EXPDIR/regress/saltwater_internal_rst ) then
210-
211-
# The splitter script requires an OutData directory
212-
# -------------------------------------------------
213-
if (! -d OutData ) mkdir -p OutData
214-
215-
# Run the script
216-
# --------------
217-
$RUN_CMD 1 $GEOSBIN/SaltIntSplitter tile.data $EXPDIR/regress/saltwater_internal_rst
218-
219-
# Move restarts
220-
# -------------
221-
/bin/mv OutData/openwater_internal_rst OutData/seaicethermo_internal_rst .
222-
223-
# Remove OutData
224-
# --------------
225-
/bin/rmdir OutData
226-
227-
endif
228-
endif
229-
230202
#######################################################################
231203
# Create Simple History for Efficiency
232204
#######################################################################

‎gcm_run.j‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -937,60 +937,6 @@ endif
937937
@CICE6 sed -i -E 's/^[[:space:]]*restart_pond_lvl[[:space:]]*=[[:space:]]*\.true\./ restart_pond_lvl = .false./' ice_in
938938
@CICE6 endif
939939
940-
#######################################################################
941-
# Split Saltwater Restart if detected
942-
#######################################################################
943-
944-
if ( (-e $SCRDIR/openwater_internal_rst) && (-e $SCRDIR/seaicethermo_internal_rst)) then
945-
echo "Saltwater internal state is already split, good to go!"
946-
else
947-
if ( ( ( -e $SCRDIR/saltwater_internal_rst ) || ( -e $EXPDIR/saltwater_internal_rst) ) && ( $counter == 1 ) ) then
948-
949-
echo "Found Saltwater internal state. Splitting..."
950-
951-
# If saltwater_internal_rst is in EXPDIR move to SCRDIR
952-
# -----------------------------------------------------
953-
if ( -e $EXPDIR/saltwater_internal_rst ) /bin/cp $EXPDIR/saltwater_internal_rst $SCRDIR
954-
955-
# The splitter script requires an OutData directory
956-
# -------------------------------------------------
957-
if (! -d OutData ) mkdir -p OutData
958-
959-
# Run the script
960-
# --------------
961-
@SINGULARITY_BUILD $RUN_CMD 1 $SINGULARITY_RUN $GEOSBIN/SaltIntSplitter tile.data $SCRDIR/saltwater_internal_rst
962-
@NATIVE_BUILD $RUN_CMD 1 $GEOSBIN/SaltIntSplitter tile.data $SCRDIR/saltwater_internal_rst
963-
964-
# Move restarts
965-
# -------------
966-
/bin/mv OutData/openwater_internal_rst OutData/seaicethermo_internal_rst .
967-
968-
# Remove OutData
969-
# --------------
970-
/bin/rmdir OutData
971-
972-
# Make decorated copies for restarts tarball
973-
# ------------------------------------------
974-
cp openwater_internal_rst $EXPID.openwater_internal_rst.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}
975-
cp seaicethermo_internal_rst $EXPID.seaicethermo_internal_rst.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}
976-
977-
# Inject decorated copies into restarts tarball
978-
# ---------------------------------------------
979-
tar rf $EXPDIR/restarts/restarts.${edate}.tar $EXPID.*.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}
980-
981-
# Remove the decorated restarts
982-
# -----------------------------
983-
/bin/rm $EXPID.*.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}
984-
985-
# Remove the saltwater internal restart
986-
# -------------------------------------
987-
/bin/rm $SCRDIR/saltwater_internal_rst
988-
else
989-
echo "Neither saltwater_internal_rst, nor openwater_internal_rst and seaicethermo_internal_rst were found. Abort!"
990-
exit 6
991-
endif
992-
endif
993-
994940
# Test Openwater Restart for Number of tiles correctness
995941
# ------------------------------------------------------
996942

‎gcm_run.j-new_rst_approach‎

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -855,62 +855,6 @@ endif
855855
@CICE6 sed -i -E 's/^[[:space:]]*restart_pond_lvl[[:space:]]*=[[:space:]]*\.true\./ restart_pond_lvl = .false./' ice_in
856856
@CICE6 endif
857857
858-
#######################################################################
859-
# Split Saltwater Restart if detected
860-
#######################################################################
861-
862-
if ( (-e $SCRDIR/openwater_internal_rst) && (-e $SCRDIR/seaicethermo_internal_rst)) then
863-
echo "Saltwater internal state is already split, good to go!"
864-
else
865-
if ( ( ( -e $SCRDIR/saltwater_internal_rst ) || ( -e $EXPDIR/saltwater_internal_rst) ) && ( $counter == 1 ) ) then
866-
867-
echo "Found Saltwater internal state. Splitting..."
868-
869-
# If saltwater_internal_rst is in EXPDIR move to SCRDIR
870-
# -----------------------------------------------------
871-
if ( -e $EXPDIR/saltwater_internal_rst ) /bin/cp $EXPDIR/saltwater_internal_rst $SCRDIR
872-
873-
# The splitter script requires an OutData directory
874-
# -------------------------------------------------
875-
if (! -d OutData ) mkdir -p OutData
876-
877-
# Run the script
878-
# --------------
879-
@SINGULARITY_BUILD $RUN_CMD 1 $SINGULARITY_RUN $GEOSBIN/SaltIntSplitter tile.data $SCRDIR/saltwater_internal_rst
880-
@NATIVE_BUILD $RUN_CMD 1 $GEOSBIN/SaltIntSplitter tile.data $SCRDIR/saltwater_internal_rst
881-
882-
# Move restarts
883-
# -------------
884-
/bin/mv OutData/openwater_internal_rst OutData/seaicethermo_internal_rst .
885-
886-
# Remove OutData
887-
# --------------
888-
/bin/rmdir OutData
889-
890-
if (-e $EXPDIR/restarts/restarts.${edate}.tar ) then
891-
# Make decorated copies for restarts tarball
892-
# ------------------------------------------
893-
cp openwater_internal_rst $EXPID.openwater_internal_rst.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}
894-
cp seaicethermo_internal_rst $EXPID.seaicethermo_internal_rst.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}
895-
896-
# Inject decorated copies into restarts tarball
897-
# ---------------------------------------------
898-
tar rf $EXPDIR/restarts/restarts.${edate}.tar $EXPID.*.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}
899-
900-
# Remove the decorated restarts
901-
# -----------------------------
902-
/bin/rm $EXPID.*.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}
903-
endif
904-
905-
# Remove the saltwater internal restart
906-
# -------------------------------------
907-
/bin/rm $SCRDIR/saltwater_internal_rst
908-
else
909-
echo "Neither saltwater_internal_rst, nor openwater_internal_rst and seaicethermo_internal_rst were found. Abort!"
910-
exit 6
911-
endif
912-
endif
913-
914858
# Test Openwater Restart for Number of tiles correctness
915859
# ------------------------------------------------------
916860

‎gcm_run_benchmark.j‎

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -734,59 +734,6 @@ endif
734734
#ln -sf $SSTDIR/dataoceanfile_MERRA2_SST.${OGCM_IM}x${OGCM_JM}.${yy}.data sst.data
735735
#ln -sf $SSTDIR/dataoceanfile_MERRA2_ICE.${OGCM_IM}x${OGCM_JM}.${yy}.data fraci.data
736736

737-
#######################################################################
738-
# Split Saltwater Restart if detected
739-
#######################################################################
740-
741-
if ( (-e $SCRDIR/openwater_internal_rst) && (-e $SCRDIR/seaicethermo_internal_rst)) then
742-
echo "Saltwater internal state is already split, good to go!"
743-
else
744-
if ( ( ( -e $SCRDIR/saltwater_internal_rst ) || ( -e $EXPDIR/saltwater_internal_rst) ) && ( $counter == 1 ) ) then
745-
746-
echo "Found Saltwater internal state. Splitting..."
747-
748-
# If saltwater_internal_rst is in EXPDIR move to SCRDIR
749-
# -----------------------------------------------------
750-
if ( -e $EXPDIR/saltwater_internal_rst ) /bin/mv $EXPDIR/saltwater_internal_rst $SCRDIR
751-
752-
# The splitter script requires an OutData directory
753-
# -------------------------------------------------
754-
if (! -d OutData ) mkdir -p OutData
755-
756-
# Run the script
757-
# --------------
758-
$RUN_CMD 1 $GEOSBIN/SaltIntSplitter tile.data $SCRDIR/saltwater_internal_rst
759-
760-
# Move restarts
761-
# -------------
762-
/bin/mv OutData/openwater_internal_rst OutData/seaicethermo_internal_rst .
763-
764-
# Remove OutData
765-
# --------------
766-
/bin/rmdir OutData
767-
768-
# Make decorated copies for restarts tarball
769-
# ------------------------------------------
770-
cp openwater_internal_rst $EXPID.openwater_internal_rst.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}
771-
cp seaicethermo_internal_rst $EXPID.seaicethermo_internal_rst.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}
772-
773-
# Inject decorated copies into restarts tarball
774-
# ---------------------------------------------
775-
tar rf $EXPDIR/restarts/restarts.${edate}.tar $EXPID.*.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}
776-
777-
# Remove the decorated restarts
778-
# -----------------------------
779-
/bin/rm $EXPID.*.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}
780-
781-
# Remove the saltwater internal restart
782-
# -------------------------------------
783-
/bin/rm $SCRDIR/saltwater_internal_rst
784-
else
785-
echo "Neither saltwater_internal_rst, nor openwater_internal_rst and seaicethermo_internal_rst were found. Abort!"
786-
exit 6
787-
endif
788-
endif
789-
790737
# Test Openwater Restart for Number of tiles correctness
791738
# ------------------------------------------------------
792739

0 commit comments

Comments
 (0)