From 404fa537db5466dc351d147f7d58e2adca6d83c6 Mon Sep 17 00:00:00 2001 From: bzhao Date: Wed, 2 Jul 2025 20:39:39 -0400 Subject: [PATCH 1/4] create proper JRA55-DO forcing data yaml file based on ocean grid resolution --- gcm_setup | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gcm_setup b/gcm_setup index 573ab63f..0d17998d 100755 --- a/gcm_setup +++ b/gcm_setup @@ -2814,6 +2814,12 @@ if( $OGCM == TRUE ) then endif +if ($DATA_ATMOS == TRUE) then + /bin/mv $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.yaml $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.tmp + cat $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.tmp | sed -e "s/@OCEAN_RES@/${OGCM_IM}x${OGCM_JM}/g" > $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.yaml +endif + + ####################################################################### # Echo Settings and Messages ####################################################################### From 71e76ea1cb24ada7f65e39950e7ad568c3c6721e Mon Sep 17 00:00:00 2001 From: bzhao Date: Thu, 10 Jul 2025 11:02:55 -0400 Subject: [PATCH 2/4] change to a different marker --- gcm_setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcm_setup b/gcm_setup index 0d17998d..42bcaa2d 100755 --- a/gcm_setup +++ b/gcm_setup @@ -2816,7 +2816,7 @@ endif if ($DATA_ATMOS == TRUE) then /bin/mv $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.yaml $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.tmp - cat $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.tmp | sed -e "s/@OCEAN_RES@/${OGCM_IM}x${OGCM_JM}/g" > $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.yaml + cat $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.tmp | sed -e "s/%OCN_RES%/${OGCM_IM}x${OGCM_JM}/g" > $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.yaml endif From ad40b1a41c37c4d8ee6a0ca2d3d069ca09af3f8f Mon Sep 17 00:00:00 2001 From: bzhao Date: Thu, 10 Jul 2025 22:22:22 -0400 Subject: [PATCH 3/4] remove temp file --- gcm_setup | 1 + 1 file changed, 1 insertion(+) diff --git a/gcm_setup b/gcm_setup index 42bcaa2d..d60b2911 100755 --- a/gcm_setup +++ b/gcm_setup @@ -2817,6 +2817,7 @@ endif if ($DATA_ATMOS == TRUE) then /bin/mv $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.yaml $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.tmp cat $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.tmp | sed -e "s/%OCN_RES%/${OGCM_IM}x${OGCM_JM}/g" > $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.yaml + /bin/rm $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.tmp endif From b51bf67b70417cc32da53fc2bada9407f6525b88 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 11 Sep 2025 08:34:04 -0400 Subject: [PATCH 4/4] Update other setup scripts --- geoschemchem_setup | 9 ++++++++- gmichem_setup | 9 ++++++++- stratchem_setup | 9 ++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/geoschemchem_setup b/geoschemchem_setup index 7677ee47..0389d761 100755 --- a/geoschemchem_setup +++ b/geoschemchem_setup @@ -2428,10 +2428,10 @@ s?@OCEAN_NAME?$OCEAN_NAME?g s?@OCEAN_PRELOAD?$OCEAN_PRELOAD?g s?@4DIAUDAS?#DELETE?g -s?@REGULAR_REPLAY?#?g s?@REGULAR_REPLAY_GMAO?#?g s?@REGULAR_REPLAY_NCEP?#DELETE?g s?@REGULAR_REPLAY_ECMWF?#DELETE?g +s?@REGULAR_REPLAY?#?g s?ana4replay.eta.%y4%m2%d2_%h2z.nc4?/discover/nobackup/projects/gmao/merra2/data/ana/MERRA2_all/Y%y4/M%m2/MERRA2.ana.eta.%y4%m2%d2_%h2z.nc4?g s?@REPLAY_ANA_EXPID?$REPLAY_ANA_EXPID?g @@ -3015,6 +3015,13 @@ if( $OGCM == TRUE ) then endif +if ($DATA_ATMOS == TRUE) then + /bin/mv $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.yaml $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.tmp + cat $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.tmp | sed -e "s/%OCN_RES%/${OGCM_IM}x${OGCM_JM}/g" > $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.yaml + /bin/rm $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.tmp +endif + + ####################################################################### # Echo Settings and Messages ####################################################################### diff --git a/gmichem_setup b/gmichem_setup index f6557ff6..4e7c959c 100755 --- a/gmichem_setup +++ b/gmichem_setup @@ -2600,10 +2600,10 @@ s?@OCEAN_NAME?$OCEAN_NAME?g s?@OCEAN_PRELOAD?$OCEAN_PRELOAD?g s?@4DIAUDAS?#DELETE?g -s?@REGULAR_REPLAY?#?g s?@REGULAR_REPLAY_GMAO?#?g s?@REGULAR_REPLAY_NCEP?#DELETE?g s?@REGULAR_REPLAY_ECMWF?#DELETE?g +s?@REGULAR_REPLAY?#?g s?ana4replay.eta.%y4%m2%d2_%h2z.nc4?/discover/nobackup/projects/gmao/merra2/data/ana/MERRA2_all/Y%y4/M%m2/MERRA2.ana.eta.%y4%m2%d2_%h2z.nc4?g s?@REPLAY_ANA_EXPID?$REPLAY_ANA_EXPID?g @@ -3247,6 +3247,13 @@ if( $OGCM == TRUE ) then endif +if ($DATA_ATMOS == TRUE) then + /bin/mv $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.yaml $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.tmp + cat $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.tmp | sed -e "s/%OCN_RES%/${OGCM_IM}x${OGCM_JM}/g" > $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.yaml + /bin/rm $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.tmp +endif + + ####################################################################### # Echo Settings and Messages ####################################################################### diff --git a/stratchem_setup b/stratchem_setup index 7c366a6d..51e41fa7 100755 --- a/stratchem_setup +++ b/stratchem_setup @@ -2413,10 +2413,10 @@ s?@OCEAN_NAME?$OCEAN_NAME?g s?@OCEAN_PRELOAD?$OCEAN_PRELOAD?g s?@4DIAUDAS?#DELETE?g -s?@REGULAR_REPLAY?#?g s?@REGULAR_REPLAY_GMAO?#?g s?@REGULAR_REPLAY_NCEP?#DELETE?g s?@REGULAR_REPLAY_ECMWF?#DELETE?g +s?@REGULAR_REPLAY?#?g s?ana4replay.eta.%y4%m2%d2_%h2z.nc4?/discover/nobackup/projects/gmao/merra2/data/ana/MERRA2_all/Y%y4/M%m2/MERRA2.ana.eta.%y4%m2%d2_%h2z.nc4?g s?@REPLAY_ANA_EXPID?$REPLAY_ANA_EXPID?g @@ -2945,6 +2945,13 @@ if( $OGCM == TRUE ) then endif +if ($DATA_ATMOS == TRUE) then + /bin/mv $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.yaml $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.tmp + cat $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.tmp | sed -e "s/%OCN_RES%/${OGCM_IM}x${OGCM_JM}/g" > $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.yaml + /bin/rm $EXPDIR/RC/JRA55-DO_DataAtm_Forcings_ExtData.tmp +endif + + ####################################################################### # Echo Settings and Messages #######################################################################