Ensure consistency between SMC coupled test nml and inp files

ukmo-waves · Oct 28, 2020 · e0d2e39 · e0d2e39
1 parent 1661f19
commit e0d2e39
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 2 deletions.
diff --git a/regtests/ww3_tp2.14/input/namelists_BREST.nml b/regtests/ww3_tp2.14/input/namelists_BREST.nml
@@ -1 +1,2 @@
+&PSMC  DTIME=10800., RFMAXD=36., LvSMC=2, NBISMC=0, CFLTM=0.1 /
 END OF NAMELISTS
diff --git a/regtests/ww3_tp2.14/input/ww3_grid_OASACM6.nml b/regtests/ww3_tp2.14/input/ww3_grid_OASACM6.nml
@@ -141,8 +141,8 @@
   GRID%TYPE         =  'RECT'
   GRID%COORD        =  'SPHE'
   GRID%CLOS         =  'NONE'
-  GRID%ZLIM         =  0.0
-  GRID%DMIN         =  1.0
+  GRID%ZLIM         =  -0.1
+  GRID%DMIN         =  10.0
 /
 
 ! -------------------------------------------------------------------- !
@@ -218,10 +218,53 @@
 ! -------------------------------------------------------------------- !
 &DEPTH_NML
   DEPTH%SF        =  -1.
+  DEPTH%FROM      =  'NAME'
   DEPTH%FILENAME  =  'SMC_unused_file'
+  DEPTH%IDF       =  30
   DEPTH%FORMAT    =  '(....)'
 /
 
+! -------------------------------------------------------------------- !
+! Define the SMC grid
+! -------------------------------------------------------------------- !
+&SMC_NML
+  SMC%MCELS%IDF       =  32
+  SMC%MCELS%IDLA      =  1
+  SMC%MCELS%IDFM      =  1
+  SMC%MCELS%FORMAT    =  '(....)'
+  SMC%MCELS%FILENAME  =  '../input/BrestSMCels.dat'
+
+  SMC%ISIDE%IDF       =  33
+  SMC%ISIDE%IDLA      =  1
+  SMC%ISIDE%IDFM      =  1
+  SMC%ISIDE%FORMAT    =  '(....)'
+  SMC%ISIDE%FILENAME  =  '../input/BrestISides.dat'
+
+  SMC%JSIDE%IDF       =  34
+  SMC%JSIDE%IDLA      =  1
+  SMC%JSIDE%IDFM      =  1
+  SMC%JSIDE%FORMAT    =  '(....)'
+  SMC%JSIDE%FILENAME  =  '../input/BrestJSides.dat'
+
+  SMC%SUBTR%IDF       =  31
+  SMC%SUBTR%IDLA      =  1
+  SMC%SUBTR%IDFM      =  1
+  SMC%SUBTR%FORMAT    =  '(....)'
+  SMC%SUBTR%FILENAME  =  '../input/BrestObstrs.dat'
+/
+
+! -------------------------------------------------------------------- !
+! Define the mask
+! -------------------------------------------------------------------- !
+&MASK_NML
+  MASK%IDF       =  39
+  MASK%IDLA      =  1
+  MASK%IDFM      =  1
+  MASK%FORMAT    =  '(....)'
+  MASK%FROM      =  'NAME'
+  MASK%FILENAME  =  'SMC_unused_file'
+/
+
 ! -------------------------------------------------------------------- !
 ! Define the input boundary points via INBND_COUNT_NML and
 !                                      INBND_POINT_NML namelist
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		&PSMC DTIME=10800., RFMAXD=36., LvSMC=2, NBISMC=0, CFLTM=0.1 /
		END OF NAMELISTS