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

Updates on the test cases and minor fixes in the rt* scripts #68

Open
wants to merge 33 commits into
base: feature/coastal_app
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
edb0b64
added ufs-coastal README files
pvelissariou1 Mar 12, 2024
a3207db
Update README.md
pvelissariou1 Mar 12, 2024
c4e2224
Update README.md
pvelissariou1 Mar 12, 2024
b064a8c
Update README.md
pvelissariou1 Mar 12, 2024
6ceb3b5
Update README.md
pvelissariou1 Mar 12, 2024
bb24454
added new SCHISM test cases (iteration 1)
pvelissariou1 Mar 14, 2024
aff1b8f
Merge branch 'cmmb' of https://github.com/oceanmodeling/ufs-coastal i…
pvelissariou1 Mar 14, 2024
28ada34
added new SCHISM test cases (iteration 2)
pvelissariou1 Mar 15, 2024
af89fa9
added new ADCIRC test cases (iteration 1)
pvelissariou1 Mar 15, 2024
24422a6
updated the rt_coastal.conf file to account for the new ADCIRC and SC…
pvelissariou1 Mar 15, 2024
07c7da1
Merge branch 'feature/coastal_app' into cmmb
pvelissariou1 Mar 15, 2024
18a2f7e
merged branch feature/coastal_app into cmmb
pvelissariou1 Mar 15, 2024
58c39a6
reverted the README.md file
pvelissariou1 Mar 18, 2024
32ae224
updated the tests/tests/coastal_sandy_shinnecock* test configurations
pvelissariou1 Apr 8, 2024
05e7803
merged SCHISM* from feature/coastal_app
pvelissariou1 Apr 8, 2024
371a525
fixes in the coastal_florence_hsofs* SCHISM tests & the coastal_ideal…
pvelissariou1 Apr 17, 2024
1af77ba
added the parameters WLCLK and MESH_WAV to the coastal test cases
pvelissariou1 Apr 17, 2024
cf8b62a
created inherited test config for coastal_florence_hsofs_atm2sch2ww3_…
pvelissariou1 Apr 18, 2024
5bef0d1
grouped the coastal tests in <tested> and <testing>
pvelissariou1 Apr 23, 2024
13cd5b1
fixed missing statement in PAHM/src/parwind.F90 that was producing ze…
pvelissariou1 May 15, 2024
1ecd724
PAHM: fixed Log sequence and minor logging issues
pvelissariou1 May 16, 2024
dd4685c
PAHM: modified netcdfio.F90 to write certain variables as floats and …
pvelissariou1 May 16, 2024
3c84ca2
PAHM: modified the codes to allow for the date_time_str variable to b…
pvelissariou1 May 17, 2024
b293804
PAHM: fixed bug in parwindd.F90/GetGAHMFields to correctly calculate …
pvelissariou1 May 19, 2024
be1e69e
updated the SCHISM sources
pvelissariou1 Jun 6, 2024
c3dc345
Added the BUILD_TOOLS option in support of "coupled" model compilatio…
pvelissariou1 Jun 6, 2024
607659f
removed corrupted SCHISM sources
pvelissariou1 Jun 6, 2024
6191e39
synchronized with feature_coastal_app
pvelissariou1 Jun 6, 2024
01e71c5
PAHM: updated the sources
pvelissariou1 Jun 6, 2024
94ac03c
changed the schism pointer to upstream cmmb branch
pvelissariou1 Jun 6, 2024
d6ca914
SCHISM: syncronized sources with upstream cmmb branch
pvelissariou1 Jun 6, 2024
fb74df2
changed the SCHISM submodule pointer to master branch
pvelissariou1 Jun 8, 2024
985194a
SCHISM: changed pointer to commit 38d9501
pvelissariou1 Jun 8, 2024
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
Prev Previous commit
Next Next commit
added the parameters WLCLK and MESH_WAV to the coastal test cases
pvelissariou1 committed Apr 17, 2024
commit 1af77ba182116100d6672cf327f566972532c670
2 changes: 1 addition & 1 deletion tests/parm/ufs.configure.coastal_datm_ocn_wav.IN
Original file line number Diff line number Diff line change
@@ -59,7 +59,7 @@ WAV_attributes::
DumpFields = false
ProfileMemory = false
merge_import = .false.
mesh_wav = mesh.shinnecock.cdf5.nc
mesh_wav = @[MESH_WAV]
multigrid = false
gridded_netcdfout = true
diro = "."
2 changes: 1 addition & 1 deletion tests/parm/ufs.configure.coastal_datm_wav.IN
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@ WAV_attributes::
DumpFields = false
ProfileMemory = false
merge_import = .false.
mesh_wav = mesh.shinnecock.cdf5.nc
mesh_wav = @[MESH_WAV]
multigrid = false
gridded_netcdfout = true
diro = "."
2 changes: 1 addition & 1 deletion tests/parm/ufs.configure.coastal_wav.IN
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ WAV_attributes::
DumpFields = false
ProfileMemory = false
merge_import = .false.
mesh_wav = mesh.shinnecock.cdf5.nc
mesh_wav = @[MESH_WAV]
multigrid = false
gridded_netcdfout = true
diro = "."
1 change: 1 addition & 0 deletions tests/rt_coastal.conf
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is better to keep only fully tested configurations in the rt_coastal.conf. It would be nice to create another file (rt_coastal_tmp.conf etc.) for the rest.

Original file line number Diff line number Diff line change
@@ -58,6 +58,7 @@ RUN | coastal_sandy_shinnecock_atm2sch | | baseline |
#P.V We might need test cases to use the internal wave model (WWM: -DUSE_WWM=ON)
COMPILE | 12 | intel | -DAPP=CSTLSW -DUSE_ATMOS=ON -DUSE_WW3=ON -DNO_PARMETIS=OFF -DOLDIO=ON -DPDLIB=ON | | fv3 |
RUN | coastal_florence_hsofs_atm2sch2ww3 | | baseline |
RUN | coastal_florence_hsofs_atm2sch2ww3_nobc | | baseline |
RUN | coastal_idealized_shinnecock_atm2sch2ww3 | | baseline |
RUN | coastal_sandy_shinnecock_atm2sch2ww3 | | baseline |

35 changes: 23 additions & 12 deletions tests/tests/coastal_florence_hsofs_atm2adc2ww3
Original file line number Diff line number Diff line change
@@ -13,19 +13,20 @@ export LIST_FILES="fort.74.nc \
fort.64.nc \
fort.63.nc \
fort.61.nc \
ufs.cpld.cpl.hi.2018-09-07-00000.nc \
ufs.cpld.cpl.hi.2018-09-08-00000.nc \
ufs.cpld.cpl.hi.2018-09-09-00000.nc"
ufs.cpld.cpl.hi.2018-09-10-00000.nc \
ufs.cpld.cpl.hi.2018-09-11-00000.nc \
ufs.cpld.cpl.hi.2018-09-12-00000.nc"

# deafult options
export_coastal

# model_configure
export SYEAR=2018
export SMONTH=09
export SDAY=07
export SDAY=10
export SHOUR=00
export FHMAX=6
export FHMAX=1
#export FHMAX=7
export FHROT=0
# not used
export DT_ATMOS=720
@@ -59,15 +60,16 @@ fi

# datm
export DATM_CDEPS=true
export DATM_STREAM_CONFIGURE=datm.streams.coastal.IN
export atm_datamode="ATMMESH"
export MESH_ATM="INPUT_DATM/Florence_CFS_ESMFmesh.nc"
export ATM_NX_GLB=264
export ATM_NY_GLB=201
export MESH_ATM="Wind_Pressure_HWRF_Florence_ExtendedSmooth_ESMFmesh.nc"
export ATM_NX_GLB=3241
export ATM_NY_GLB=2761
export EXPORT_ALL=.true.
export FILENAME_BASE='atmmesh.'
export STREAM_VECTORS="null"
export stream_files="\"INPUT_DATM/Florence_CFS.nc\""
export stream_variables="\"U_GRD_L103 Sa_u10m\" \"V_GRD_L103 Sa_v10m\" \"PRES_L1 Sa_pslv\""
export stream_files="\"INPUT/Wind_Pressure_HWRF_Florence_ExtendedSmooth.nc\""
export stream_variables="\"uwnd Sa_u10m\" \"vwnd Sa_v10m\" \"P Sa_pslv\""
export mapalgo=redist
export dtlimit=1.5
export STREAM_OFFSET=0
@@ -77,15 +79,24 @@ export HURR="Florence"
export CPL_CONF="atm2adc2ww3"

# pes
export ATM_compute_tasks=16
export OCN_tasks=149
export ATM_compute_tasks=20
export OCN_tasks=240
export WAV_tasks=480

export WLCLK=120

# configuration
export MODEL_CONFIGURE=model_configure.IN
export UFS_CONFIGURE=ufs.configure.coastal_datm_ocn_wav.IN
export med_model=cmeps
export med_omp_num_threads=1
export atm_model=datm
export atm_omp_num_threads=1
export ocn_model=adcirc
export ocn_omp_num_threads=1
export wav_model=ww3
export wav_omp_num_threads=1
export MESH_WAV="HSOFS_ESMFmesh.nc"
export coupling_interval_slow_sec=3600
export RESTART_N=12
export RUNTYPE=startup
1 change: 1 addition & 0 deletions tests/tests/coastal_florence_hsofs_atm2sch2ww3
Original file line number Diff line number Diff line change
@@ -107,6 +107,7 @@ export ocn_model=schism
export ocn_omp_num_threads=1
export wav_model=ww3
export wav_omp_num_threads=1
export MESH_WAV="HSOFS_hgrid_ESMFmesh.nc"
export coupling_interval_slow_sec=3600
export RESTART_N=12
export RUNTYPE=startup
118 changes: 118 additions & 0 deletions tests/tests/coastal_florence_hsofs_atm2sch2ww3_nobc
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
###############################################################################
#
# SCHISM coupled florence_hsofs_atm2sch2ww3 configuration
#
###############################################################################

export TEST_DESCR="Compare florence_hsofs_atm2sch2ww3 results with previous trunk version"

export CNTL_DIR=coastal_florence_hsofs_atm2sch2ww3

export LIST_FILES="outputs/schout_000000_1.nc \
outputs/schout_000001_1.nc \
outputs/schout_000002_1.nc \
outputs/schout_000003_1.nc \
outputs/schout_000004_1.nc \
outputs/schout_000005_1.nc \
outputs/schout_000006_1.nc \
outputs/schout_000007_1.nc \
outputs/schout_000008_1.nc
20180910.000000.out_grd.ww3.nc \
20180911.000000.out_grd.ww3.nc \
20180912.000000.out_grd.ww3.nc \
20180913.000000.out_grd.ww3.nc \
20180914.000000.out_grd.ww3.nc \
ufs.cpld.cpl.hi.2018-09-10-00000.nc \
ufs.cpld.cpl.hi.2018-09-11-00000.nc \
ufs.cpld.cpl.hi.2018-09-12-00000.nc \
ufs.cpld.cpl.hi.2018-09-13-00000.nc \
ufs.cpld.cpl.hi.2018-09-14-00000.nc"

# deafult options
export_coastal

# model_configure
export SYEAR=2018
export SMONTH=09
export SDAY=10
export SHOUR=00
export FHMAX=1
#export FHMAX=7
export FHROT=0
# not used
export DT_ATMOS=720
export RESTART_INTERVAL=0
export QUILTING=.true.
export QUILTING_RESTART=.false.
export WRITE_GROUP=1
export WRTTASK_PER_GROUP=6
export ITASKS=1
export OUTPUT_HISTORY=.true.
export WRITE_DOPOST=.false.
export NUM_FILES=2
export FILENAME_BASE="'atm' 'sfc'"
export OUTPUT_GRID="'cubed_sphere_grid'"
export OUTPUT_FILE="'netcdf'"
export IDEFLATE=0
export NBITS=0
export ICHUNK2D=0
export JCHUNK2D=0
export ICHUNK3D=0
export JCHUNK3D=0
export KCHUNK3D=0
export IMO=384
export JMO=190
export WRITE_NSFLIP=.false.
export OUTPUT_FH="12 -1"
export IAU_OFFSET=0
if [[ " hera orion hercules gaea jet " =~ " ${MACHINE_ID} " ]] ; then
ZSTANDARD_LEVEL=5
fi

# datm
export DATM_CDEPS=true
export DATM_STREAM_CONFIGURE=datm.streams.coastal.IN
export atm_datamode="ATMMESH"
export MESH_ATM="Wind_Pressure_HWRF_Florence_ExtendedSmooth_ESMFmesh.nc"
export ATM_NX_GLB=3241
export ATM_NY_GLB=2761
export EXPORT_ALL=.true.
export FILENAME_BASE='atmmesh.'
export STREAM_VECTORS="null"
export stream_files="\"INPUT/Wind_Pressure_HWRF_Florence_ExtendedSmooth.nc\""
export stream_variables="\"uwnd Sa_u10m\" \"vwnd Sa_v10m\" \"P Sa_pslv\""
export mapalgo=redist
export dtlimit=1.5
export STREAM_OFFSET=0

# datm/ocean
export HURR="Florence"
export CPL_CONF="atm2sch2ww3"

# pes
export ATM_compute_tasks=20
export OCN_tasks=240
export WAV_tasks=480

export WLCLK=120

# configuration
export MODEL_CONFIGURE=model_configure.IN
export UFS_CONFIGURE=ufs.configure.coastal_datm_ocn_wav.IN
export med_model=cmeps
export med_omp_num_threads=1
export atm_model=datm
export atm_omp_num_threads=1
export ocn_model=schism
export ocn_omp_num_threads=1
export wav_model=ww3
export wav_omp_num_threads=1
export MESH_WAV="HSOFS_hgrid_nobc_ESMFmesh.nc"
export coupling_interval_slow_sec=3600
export RESTART_N=12
export RUNTYPE=startup
export CPLMODE=coastal
export meshloc=element

# input files
export FV3_RUN="coastal_datm_atmmesh.IN coastal_schism_run.IN coastal_ww3_run.IN"
17 changes: 8 additions & 9 deletions tests/tests/coastal_florence_hsofs_pam2adc2ww3
Original file line number Diff line number Diff line change
@@ -13,9 +13,9 @@ export LIST_FILES="fort.74.nc \
fort.64.nc \
fort.63.nc \
fort.61.nc \
ufs.cpld.cpl.hi.2018-09-07-00000.nc \
ufs.cpld.cpl.hi.2018-09-08-00000.nc \
ufs.cpld.cpl.hi.2018-09-09-00000.nc"
ufs.cpld.cpl.hi.2018-09-10-00000.nc \
ufs.cpld.cpl.hi.2018-09-11-00000.nc \
ufs.cpld.cpl.hi.2018-09-12-00000.nc"

# deafult options
export_coastal
@@ -59,26 +59,25 @@ fi

# pes
export ATM_compute_tasks=1
export OCN_tasks=149
export WAV_tasks=350
export OCN_tasks=240
export WAV_tasks=480

export WLCLK=120

# configuration
export HURR="Florence"
export CPL_CONF="pam2adc2ww3"
export MODEL_CONFIGURE=model_configure.IN
export UFS_CONFIGURE=ufs.configure.coastal_datm_ocn_wav.IN
export med_model=cmeps
export med_petlist_bounds="0 499"
export med_omp_num_threads=1
export atm_model=pahm
export atm_petlist_bounds="0 499"
export atm_omp_num_threads=1
export ocn_model=adcirc
export ocn_petlist_bounds="0 499"
export ocn_omp_num_threads=1
export wav_model=ww3
export wav_petlist_bounds="0 499"
export wav_omp_num_threads=1
export MESH_WAV="HSOFS_ESMFmesh.nc"
export coupling_interval_slow_sec=3600
export RESTART_N=12
export RUNTYPE=startup
30 changes: 18 additions & 12 deletions tests/tests/coastal_florence_hsofs_pam2sch2ww3
Original file line number Diff line number Diff line change
@@ -9,23 +9,30 @@ export TEST_DESCR="Compare florence_hsofs_pam2sch2ww3 results with previous trun
export CNTL_DIR=coastal_florence_hsofs_pam2sch2ww3

export LIST_FILES="outputs/schout_000000_1.nc \
outputs/schout_000000_2.nc \
outputs/schout_000001_1.nc \
outputs/schout_000001_2.nc \
outputs/schout_000002_1.nc \
outputs/schout_000002_2.nc \
outputs/schout_000003_1.nc \
outputs/schout_000003_2.nc"
outputs/schout_000004_1.nc \
outputs/schout_000005_1.nc \
outputs/schout_000006_1.nc \
outputs/schout_000007_1.nc \
outputs/schout_000008_1.nc \
20180910.000000.out_grd.ww3.nc \
20180911.000000.out_grd.ww3.nc \
20180912.000000.out_grd.ww3.nc \
20180913.000000.out_grd.ww3.nc \
20180914.000000.out_grd.ww3.nc"

# deafult options
export_coastal

# model_configure
export SYEAR=2018
export SMONTH=09
export SDAY=07
export SDAY=10
export SHOUR=00
export FHMAX=6
export FHMAX=1
#export FHMAX=7
export FHROT=0
# not used
export DT_ATMOS=720
@@ -59,26 +66,25 @@ fi

# pes
export ATM_compute_tasks=1
export OCN_tasks=149
export WAV_tasks=350
export OCN_tasks=240
export WAV_tasks=480

export WLCLK=120

# configuration
export HURR="Florence"
export CPL_CONF="pam2sch2ww3"
export MODEL_CONFIGURE=model_configure.IN
export UFS_CONFIGURE=ufs.configure.coastal_datm_ocn_wav.IN
export med_model=cmeps
export med_petlist_bounds="0 499"
export med_omp_num_threads=1
export atm_model=pahm
export atm_petlist_bounds="0 499"
export atm_omp_num_threads=1
export ocn_model=schism
export ocn_petlist_bounds="0 499"
export ocn_omp_num_threads=1
export wav_model=ww3
export wav_petlist_bounds="0 499"
export wav_omp_num_threads=1
export MESH_WAV="HSOFS_hgrid_ESMFmesh.nc"
export coupling_interval_slow_sec=3600
export RESTART_N=12
export RUNTYPE=startup
7 changes: 7 additions & 0 deletions tests/tests/coastal_idealized_shinnecock_atm2adc2ww3
Original file line number Diff line number Diff line change
@@ -82,13 +82,20 @@ export ATM_compute_tasks=8
export OCN_tasks=8
export WAV_tasks=64

export WLCLK=60

# configuration
export MODEL_CONFIGURE=model_configure.IN
export UFS_CONFIGURE=ufs.configure.coastal_datm_ocn_wav.IN
export med_model=cmeps
export med_omp_num_threads=1
export atm_model=datm
export atm_omp_num_threads=1
export ocn_model=adcirc
export ocn_omp_num_threads=1
export wav_model=ww3
export wav_omp_num_threads=1
export MESH_WAV="mesh.shinnecock.cdf5.nc"
export coupling_interval_slow_sec=3600
export RESTART_N=12
export RUNTYPE=startup
7 changes: 7 additions & 0 deletions tests/tests/coastal_idealized_shinnecock_atm2sch2ww3
Original file line number Diff line number Diff line change
@@ -90,13 +90,20 @@ export ATM_compute_tasks=8
export OCN_tasks=8
export WAV_tasks=64

export WLCLK=60

# configuration
export MODEL_CONFIGURE=model_configure.IN
export UFS_CONFIGURE=ufs.configure.coastal_datm_ocn_wav.IN
export med_model=cmeps
export med_omp_num_threads=1
export atm_model=datm
export atm_omp_num_threads=1
export ocn_model=schism
export ocn_omp_num_threads=1
export wav_model=ww3
export wav_omp_num_threads=1
export MESH_WAV="mesh.shinnecock.cdf5.nc"
export coupling_interval_slow_sec=3600
export RESTART_N=12
export RUNTYPE=startup
Loading