Index: /NEMO/branches/2020/dev_r12953_ENHANCE-10_acc_fix_traqsr/cfgs/SHARED/field_def_nemo-oce.xml
===================================================================
--- /NEMO/branches/2020/dev_r12953_ENHANCE-10_acc_fix_traqsr/cfgs/SHARED/field_def_nemo-oce.xml (revision 13194)
+++ /NEMO/branches/2020/dev_r12953_ENHANCE-10_acc_fix_traqsr/cfgs/SHARED/field_def_nemo-oce.xml (revision 13195)
@@ -1,3 +1,3 @@
-
+
@@ -16,5 +16,5 @@
Configuration of multiple-linear-regression analysis (diamlr)
=====================================================================================================
-
+
This field group configures diamlr for tidal harmonic analysis of field
ssh: in addition to a regressor for fitting the mean value (diamlr_r101),
@@ -73,6 +73,6 @@
-
-
-
+
-
+
-
+
toce * e3t
@@ -146,5 +146,5 @@
-
+
sss * sss
@@ -152,7 +152,7 @@
-
-
-
+
+
+
@@ -295,5 +295,5 @@
-
+
@@ -311,5 +311,5 @@
-
+
@@ -321,5 +321,5 @@
-
+
@@ -369,11 +369,18 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -413,11 +420,11 @@
-
+
-
+
-
+
@@ -430,8 +437,8 @@
-
+
-
+
@@ -464,5 +471,5 @@
- sqrt( uz1_dta^2 + vz1_dta^2 )
+ sqrt( uz1_dta^2 + vz1_dta^2 )
@@ -470,12 +477,12 @@
- sqrt( uz1_geo^2 + vz1_geo^2 )
+ sqrt( uz1_geo^2 + vz1_geo^2 )
-
+
-
+
@@ -486,8 +493,8 @@
uoce * e3u
- this * uoce_e3u_vsum
+ this * uoce_e3u_vsum
@uocetr_vsum
-
+
uocetr_vsum_cumul * $rau0
@@ -542,7 +549,7 @@
-
+
-
+
@@ -601,11 +608,11 @@
-
+
-
+
- woce * e3w
+ woce * e3w
@@ -617,17 +624,17 @@
- avt * e3w
+ avt * e3w
- avm * e3w
+ avm * e3w
- avs * e3w
+ avs * e3w
- avt_evd * e3w
+ avt_evd * e3w
@@ -642,10 +649,10 @@
-
+
-
+
@@ -702,5 +709,5 @@
-
+
@@ -717,5 +724,5 @@
-
+
@@ -735,6 +742,6 @@
-
-
+
+
@@ -744,5 +751,5 @@
-
+
@@ -750,5 +757,5 @@
-
+
@@ -766,5 +773,5 @@
-
-
-
+
+
-
+
@@ -934,7 +941,7 @@
-
-
-
+
+
+
@@ -953,8 +960,8 @@
-
-
-
-
+
+
+
+
@@ -973,12 +980,12 @@
-
-
-
-
+
+
+
+
-
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
Index: /NEMO/branches/2020/dev_r12953_ENHANCE-10_acc_fix_traqsr/src/OCE/SBC/sbcblk.F90
===================================================================
--- /NEMO/branches/2020/dev_r12953_ENHANCE-10_acc_fix_traqsr/src/OCE/SBC/sbcblk.F90 (revision 13194)
+++ /NEMO/branches/2020/dev_r12953_ENHANCE-10_acc_fix_traqsr/src/OCE/SBC/sbcblk.F90 (revision 13195)
@@ -627,8 +627,15 @@
END SELECT
-
- CALL iom_put("Cd_oce", zcd_oce)
- CALL iom_put("Ce_oce", zce_oce)
- CALL iom_put("Ch_oce", zch_oce)
+
+ IF( iom_use('Cd_oce') ) CALL iom_put("Cd_oce", zcd_oce * tmask(:,:,1))
+ IF( iom_use('Ce_oce') ) CALL iom_put("Ce_oce", zce_oce * tmask(:,:,1))
+ IF( iom_use('Ch_oce') ) CALL iom_put("Ch_oce", zch_oce * tmask(:,:,1))
+ !! LB: mainly here for debugging purpose:
+ IF( iom_use('theta_zt') ) CALL iom_put("theta_zt", (ztpot-rt0) * tmask(:,:,1)) ! potential temperature at z=zt
+ IF( iom_use('q_zt') ) CALL iom_put("q_zt", zqair * tmask(:,:,1)) ! specific humidity "
+ IF( iom_use('theta_zu') ) CALL iom_put("theta_zu", (t_zu -rt0) * tmask(:,:,1)) ! potential temperature at z=zu
+ IF( iom_use('q_zu') ) CALL iom_put("q_zu", q_zu * tmask(:,:,1)) ! specific humidity "
+ IF( iom_use('ssq') ) CALL iom_put("ssq", pssq * tmask(:,:,1)) ! saturation specific humidity at z=0
+ IF( iom_use('wspd_blk') ) CALL iom_put("wspd_blk", zU_zu * tmask(:,:,1)) ! bulk wind speed at z=zu
IF( ln_skin_cs .OR. ln_skin_wl ) THEN
@@ -883,7 +890,7 @@
ENDIF
- CALL iom_put("Cd_ice", Cd_ice)
- CALL iom_put("Ce_ice", Ce_ice)
- CALL iom_put("Ch_ice", Ch_ice)
+ IF( iom_use('Cd_ice') ) CALL iom_put("Cd_ice", Cd_ice)
+ IF( iom_use('Ce_ice') ) CALL iom_put("Ce_ice", Ce_ice)
+ IF( iom_use('Ch_ice') ) CALL iom_put("Ch_ice", Ch_ice)
! local scalars ( place there for vector optimisation purposes)
Index: /NEMO/branches/2020/dev_r12953_ENHANCE-10_acc_fix_traqsr/src/OCE/stpctl.F90
===================================================================
--- /NEMO/branches/2020/dev_r12953_ENHANCE-10_acc_fix_traqsr/src/OCE/stpctl.F90 (revision 13194)
+++ /NEMO/branches/2020/dev_r12953_ENHANCE-10_acc_fix_traqsr/src/OCE/stpctl.F90 (revision 13195)
@@ -119,27 +119,37 @@
! !== test of local extrema ==!
! !== done by all processes at every time step ==!
+ !
+ ! define zmax default value. needed for land processors
+ IF( ll_colruns ) THEN ! default value: must not be kept when calling mpp_max -> must be as small as possible
+ zmax(:) = -HUGE(1._wp)
+ ELSE ! default value: must not give true for any of the tests bellow (-> avoid manipulating HUGE...)
+ zmax(:) = 0._wp
+ zmax(3) = -1._wp ! avoid salinity minimum at 0.
+ ENDIF
+ !
llmsk(:,:,1) = ssmask(:,:) == 1._wp
- IF( ll_wd ) THEN
- zmax(1) = MAXVAL( ABS( ssh(:,:,Kmm) + ssh_ref ), mask = llmsk(:,:,1) ) ! ssh max
- ELSE
- zmax(1) = MAXVAL( ABS( ssh(:,:,Kmm) ), mask = llmsk(:,:,1) ) ! ssh max
- ENDIF
- llmsk(:,:,:) = umask(:,:,:) == 1._wp
- zmax(2) = MAXVAL( ABS( uu(:,:,:,Kmm) ), mask = llmsk ) ! velocity max (zonal only)
+ IF( COUNT( llmsk(:,:,1) ) > 0 ) THEN ! avoid huge values sent back for land processors...
+ IF( ll_wd ) THEN
+ zmax(1) = MAXVAL( ABS( ssh(:,:,Kmm) + ssh_ref ), mask = llmsk(:,:,1) ) ! ssh max
+ ELSE
+ zmax(1) = MAXVAL( ABS( ssh(:,:,Kmm) ), mask = llmsk(:,:,1) ) ! ssh max
+ ENDIF
+ ENDIF
+ zmax(2) = MAXVAL( ABS( uu(:,:,:,Kmm) ) ) ! velocity max (zonal only)
llmsk(:,:,:) = tmask(:,:,:) == 1._wp
- zmax(3) = MAXVAL( -ts(:,:,:,jp_sal,Kmm), mask = llmsk ) ! minus salinity max
- zmax(4) = MAXVAL( ts(:,:,:,jp_sal,Kmm), mask = llmsk ) ! salinity max
- IF( ll_colruns .OR. jpnij == 1 ) THEN ! following variables are used only in the netcdf file
- zmax(5) = MAXVAL( -ts(:,:,:,jp_tem,Kmm), mask = llmsk ) ! minus temperature max
- zmax(6) = MAXVAL( ts(:,:,:,jp_tem,Kmm), mask = llmsk ) ! temperature max
- IF( ln_zad_Aimp ) THEN
- zmax(7) = MAXVAL( Cu_adv(:,:,:) , mask = llmsk ) ! partitioning coeff. max
- llmsk(:,:,:) = wmask(:,:,:) == 1._wp
- zmax(8) = MAXVAL( ABS( wi(:,:,:) ) , mask = llmsk ) ! implicit vertical vel. max
- ELSE
- zmax(7:8) = 0._wp
- ENDIF
- ELSE
- zmax(5:8) = 0._wp
+ IF( COUNT( llmsk(:,:,:) ) > 0 ) THEN ! avoid huge values sent back for land processors...
+ zmax(3) = MAXVAL( -ts(:,:,:,jp_sal,Kmm), mask = llmsk ) ! minus salinity max
+ zmax(4) = MAXVAL( ts(:,:,:,jp_sal,Kmm), mask = llmsk ) ! salinity max
+ IF( ll_colruns .OR. jpnij == 1 ) THEN ! following variables are used only in the netcdf file
+ zmax(5) = MAXVAL( -ts(:,:,:,jp_tem,Kmm), mask = llmsk ) ! minus temperature max
+ zmax(6) = MAXVAL( ts(:,:,:,jp_tem,Kmm), mask = llmsk ) ! temperature max
+ IF( ln_zad_Aimp ) THEN
+ zmax(7) = MAXVAL( Cu_adv(:,:,:) , mask = llmsk ) ! partitioning coeff. max
+ llmsk(:,:,:) = wmask(:,:,:) == 1._wp
+ IF( COUNT( llmsk(:,:,:) ) > 0 ) THEN ! avoid huge values sent back for land processors...
+ zmax(8) = MAXVAL(ABS( wi(:,:,:) ), mask = llmsk ) ! implicit vertical vel. max
+ ENDIF
+ ENDIF
+ ENDIF
ENDIF
zmax(9) = REAL( nstop, wp ) ! stop indicator
Index: /NEMO/branches/2020/dev_r12953_ENHANCE-10_acc_fix_traqsr/src/SAS/stpctl.F90
===================================================================
--- /NEMO/branches/2020/dev_r12953_ENHANCE-10_acc_fix_traqsr/src/SAS/stpctl.F90 (revision 13194)
+++ /NEMO/branches/2020/dev_r12953_ENHANCE-10_acc_fix_traqsr/src/SAS/stpctl.F90 (revision 13195)
@@ -112,7 +112,15 @@
! !== done by all processes at every time step ==!
llmsk(:,:) = tmask(:,:,1) == 1._wp
- zmax(1) = MAXVAL( vt_i (:,:) , mask = llmsk ) ! max ice thickness
- zmax(2) = MAXVAL( ABS( u_ice(:,:) ) , mask = llmsk ) ! max ice velocity (zonal only)
- zmax(3) = MAXVAL( -tm_i (:,:) + 273.15_wp, mask = llmsk ) ! min ice temperature
+ IF( COUNT( llmsk(:,:) ) > 0 ) THEN ! avoid huge values sent back for land processors...
+ zmax(1) = MAXVAL( vt_i (:,:) , mask = llmsk ) ! max ice thickness
+ zmax(2) = MAXVAL( ABS( u_ice(:,:) ) , mask = llmsk ) ! max ice velocity (zonal only)
+ zmax(3) = MAXVAL( -tm_i (:,:) + 273.15_wp, mask = llmsk ) ! min ice temperature
+ ELSE
+ IF( ll_colruns ) THEN ! default value: must not be kept when calling mpp_max -> must be as small as possible
+ zmax(1:3) = -HUGE(1._wp)
+ ELSE ! default value: must not give true for any of the tests bellow (-> avoid manipulating HUGE...)
+ zmax(1:3) = 0._wp
+ ENDIF
+ ENDIF
zmax(4) = REAL( nstop, wp ) ! stop indicator
! !== get global extrema ==!
Index: /NEMO/branches/2020/dev_r12953_ENHANCE-10_acc_fix_traqsr/tests/CANAL/MY_SRC/stpctl.F90
===================================================================
--- /NEMO/branches/2020/dev_r12953_ENHANCE-10_acc_fix_traqsr/tests/CANAL/MY_SRC/stpctl.F90 (revision 13194)
+++ /NEMO/branches/2020/dev_r12953_ENHANCE-10_acc_fix_traqsr/tests/CANAL/MY_SRC/stpctl.F90 (revision 13195)
@@ -119,27 +119,37 @@
! !== test of local extrema ==!
! !== done by all processes at every time step ==!
+ !
+ ! define zmax default value. needed for land processors
+ IF( ll_colruns ) THEN ! default value: must not be kept when calling mpp_max -> must be as small as possible
+ zmax(:) = -HUGE(1._wp)
+ ELSE ! default value: must not give true for any of the tests bellow (-> avoid manipulating HUGE...)
+ zmax(:) = 0._wp
+ zmax(3) = -1._wp ! avoid salinity minimum at 0.
+ ENDIF
+ !
llmsk(:,:,1) = ssmask(:,:) == 1._wp
- IF( ll_wd ) THEN
- zmax(1) = MAXVAL( ABS( ssh(:,:,Kmm) + ssh_ref ), mask = llmsk(:,:,1) ) ! ssh max
- ELSE
- zmax(1) = MAXVAL( ABS( ssh(:,:,Kmm) ), mask = llmsk(:,:,1) ) ! ssh max
- ENDIF
- llmsk(:,:,:) = umask(:,:,:) == 1._wp
- zmax(2) = MAXVAL( ABS( uu(:,:,:,Kmm) ), mask = llmsk ) ! velocity max (zonal only)
+ IF( COUNT( llmsk(:,:,1) ) > 0 ) THEN ! avoid huge values sent back for land processors...
+ IF( ll_wd ) THEN
+ zmax(1) = MAXVAL( ABS( ssh(:,:,Kmm) + ssh_ref ), mask = llmsk(:,:,1) ) ! ssh max
+ ELSE
+ zmax(1) = MAXVAL( ABS( ssh(:,:,Kmm) ), mask = llmsk(:,:,1) ) ! ssh max
+ ENDIF
+ ENDIF
+ zmax(2) = MAXVAL( ABS( uu(:,:,:,Kmm) ) ) ! velocity max (zonal only)
llmsk(:,:,:) = tmask(:,:,:) == 1._wp
- zmax(3) = MAXVAL( -ts(:,:,:,jp_sal,Kmm), mask = llmsk ) ! minus salinity max
- zmax(4) = MAXVAL( ts(:,:,:,jp_sal,Kmm), mask = llmsk ) ! salinity max
- IF( ll_colruns .OR. jpnij == 1 ) THEN ! following variables are used only in the netcdf file
- zmax(5) = MAXVAL( -ts(:,:,:,jp_tem,Kmm), mask = llmsk ) ! minus temperature max
- zmax(6) = MAXVAL( ts(:,:,:,jp_tem,Kmm), mask = llmsk ) ! temperature max
- IF( ln_zad_Aimp ) THEN
- zmax(7) = MAXVAL( Cu_adv(:,:,:) , mask = llmsk ) ! partitioning coeff. max
- llmsk(:,:,:) = wmask(:,:,:) == 1._wp
- zmax(8) = MAXVAL( ABS( wi(:,:,:) ) , mask = llmsk ) ! implicit vertical vel. max
- ELSE
- zmax(7:8) = 0._wp
- ENDIF
- ELSE
- zmax(5:8) = 0._wp
+ IF( COUNT( llmsk(:,:,:) ) > 0 ) THEN ! avoid huge values sent back for land processors...
+ zmax(3) = MAXVAL( -ts(:,:,:,jp_sal,Kmm), mask = llmsk ) ! minus salinity max
+ zmax(4) = MAXVAL( ts(:,:,:,jp_sal,Kmm), mask = llmsk ) ! salinity max
+ IF( ll_colruns .OR. jpnij == 1 ) THEN ! following variables are used only in the netcdf file
+ zmax(5) = MAXVAL( -ts(:,:,:,jp_tem,Kmm), mask = llmsk ) ! minus temperature max
+ zmax(6) = MAXVAL( ts(:,:,:,jp_tem,Kmm), mask = llmsk ) ! temperature max
+ IF( ln_zad_Aimp ) THEN
+ zmax(7) = MAXVAL( Cu_adv(:,:,:) , mask = llmsk ) ! partitioning coeff. max
+ llmsk(:,:,:) = wmask(:,:,:) == 1._wp
+ IF( COUNT( llmsk(:,:,:) ) > 0 ) THEN ! avoid huge values sent back for land processors...
+ zmax(8) = MAXVAL(ABS( wi(:,:,:) ), mask = llmsk ) ! implicit vertical vel. max
+ ENDIF
+ ENDIF
+ ENDIF
ENDIF
zmax(9) = REAL( nstop, wp ) ! stop indicator
Index: /NEMO/branches/2020/dev_r12953_ENHANCE-10_acc_fix_traqsr/tests/STATION_ASF/EXPREF/file_def_nemo-oce.xml
===================================================================
--- /NEMO/branches/2020/dev_r12953_ENHANCE-10_acc_fix_traqsr/tests/STATION_ASF/EXPREF/file_def_nemo-oce.xml (revision 13194)
+++ /NEMO/branches/2020/dev_r12953_ENHANCE-10_acc_fix_traqsr/tests/STATION_ASF/EXPREF/file_def_nemo-oce.xml (revision 13195)
@@ -34,4 +34,10 @@
+
+
+
+
+
+
Index: /NEMO/branches/2020/dev_r12953_ENHANCE-10_acc_fix_traqsr/tests/STATION_ASF/EXPREF/launch_sasf.sh
===================================================================
--- /NEMO/branches/2020/dev_r12953_ENHANCE-10_acc_fix_traqsr/tests/STATION_ASF/EXPREF/launch_sasf.sh (revision 13194)
+++ /NEMO/branches/2020/dev_r12953_ENHANCE-10_acc_fix_traqsr/tests/STATION_ASF/EXPREF/launch_sasf.sh (revision 13195)
@@ -1,35 +1,58 @@
#!/bin/bash
-# NEMO directory where to fetch compiled STATION_ASF nemo.exe + setup:
-NEMO_DIR=`pwd | sed -e "s|/tests/STATION_ASF/EXPREF||g"`
+################################################################
+#
+# Script to launch a set of STATION_ASF simulations
+#
+# L. Brodeau, 2020
+#
+################################################################
-echo "Using NEMO_DIR=${NEMO_DIR}"
-
-# what directory inside "tests" actually contains the compiled test-case?
+# What directory inside "tests" actually contains the compiled "nemo.exe" for STATION_ASF ?
TC_DIR="STATION_ASF2"
-# => so the executable to use is:
-NEMO_EXE="${NEMO_DIR}/tests/${TC_DIR}/BLD/bin/nemo.exe"
+# DATA_IN_DIR => Directory containing sea-surface + atmospheric forcings
+# (get it there https://drive.google.com/file/d/1MxNvjhRHmMrL54y6RX7WIaM9-LGl--ZP/):
+if [ `hostname` = "merlat" ]; then
+ DATA_IN_DIR="/MEDIA/data/STATION_ASF/input_data_STATION_ASF_2016-2018"
+elif [ `hostname` = "luitel" ]; then
+ DATA_IN_DIR="/data/gcm_setup/STATION_ASF/input_data_STATION_ASF_2016-2018"
+elif [ `hostname` = "ige-meom-cal1" ]; then
+ DATA_IN_DIR="/mnt/meom/workdir/brodeau/STATION_ASF/input_data_STATION_ASF_2016-2018"
+elif [ `hostname` = "salvelinus" ]; then
+ DATA_IN_DIR="/opt/data/STATION_ASF/input_data_STATION_ASF_2016-2018"
+else
+ echo "Oops! We don't know `hostname` yet! Define 'DATA_IN_DIR' in the script!"; exit
+fi
+
+expdir=`basename ${PWD}`; # we expect "EXPREF" or "EXP00" normally...
+
+# NEMOGCM root directory where to fetch compiled STATION_ASF nemo.exe + setup:
+NEMO_WRK_DIR=`pwd | sed -e "s|/tests/STATION_ASF/${expdir}||g"`
# Directory where to run the simulation:
-WORK_DIR="${HOME}/tmp/STATION_ASF"
+PROD_DIR="${HOME}/tmp/STATION_ASF"
-# FORC_DIR => Directory containing sea-surface + atmospheric forcings
-# (get it there https://drive.google.com/file/d/1MxNvjhRHmMrL54y6RX7WIaM9-LGl--ZP/):
-if [ `hostname` = "merlat" ]; then
- FORC_DIR="/MEDIA/data/STATION_ASF/input_data_STATION_ASF_2016-2018"
-elif [ `hostname` = "luitel" ]; then
- FORC_DIR="/data/gcm_setup/STATION_ASF/input_data_STATION_ASF_2016-2018"
-elif [ `hostname` = "ige-meom-cal1" ]; then
- FORC_DIR="/mnt/meom/workdir/brodeau/STATION_ASF/input_data_STATION_ASF_2016-2018"
-elif [ `hostname` = "salvelinus" ]; then
- FORC_DIR="/opt/data/STATION_ASF/input_data_STATION_ASF_2016-2018"
-else
- echo "Boo!"; exit
-fi
-#======================
-mkdir -p ${WORK_DIR}
+####### End of normal user configurable section #######
+#================================================================================
+
+# NEMO executable to use is:
+NEMO_EXE="${NEMO_WRK_DIR}/tests/${TC_DIR}/BLD/bin/nemo.exe"
+
+
+echo "###########################################################"
+echo "# S T A T I O N A i r - S e a F l u x #"
+echo "###########################################################"
+echo
+echo " We shall work in here: ${STATION_ASF_DIR}/"
+echo " NEMOGCM work depository is: ${NEMO_WRK_DIR}/"
+echo " ==> NEMO EXE to use: ${NEMO_EXE}"
+echo " Input forcing data into: ${DATA_IN_DIR}/"
+echo " Production will be done into: ${PROD_DIR}/"
+echo
+
+mkdir -p ${PROD_DIR}
if [ ! -f ${NEMO_EXE} ]; then echo " Mhhh, no compiled 'nemo.exe' found into `dirname ${NEMO_EXE}` !"; exit; fi
@@ -40,17 +63,16 @@
echo
-
-NEMO_EXPREF="${NEMO_DIR}/tests/STATION_ASF/EXPREF"
+NEMO_EXPREF="${NEMO_WRK_DIR}/tests/STATION_ASF/EXPREF"
if [ ! -d ${NEMO_EXPREF} ]; then echo " Mhhh, no EXPREF directory ${NEMO_EXPREF} !"; exit; fi
-rsync -avP ${NEMO_EXE} ${WORK_DIR}/
+rsync -avP ${NEMO_EXE} ${PROD_DIR}/
for ff in "context_nemo.xml" "domain_def_nemo.xml" "field_def_nemo-oce.xml" "file_def_nemo-oce.xml" "grid_def_nemo.xml" "iodef.xml" "namelist_ref"; do
if [ ! -f ${NEMO_EXPREF}/${ff} ]; then echo " Mhhh, ${ff} not found into ${NEMO_EXPREF} !"; exit; fi
- rsync -avPL ${NEMO_EXPREF}/${ff} ${WORK_DIR}/
+ rsync -avPL ${NEMO_EXPREF}/${ff} ${PROD_DIR}/
done
# Copy forcing to work directory:
-rsync -avP ${FORC_DIR}/Station_PAPA_50N-145W*.nc ${WORK_DIR}/
+rsync -avP ${DATA_IN_DIR}/Station_PAPA_50N-145W*.nc ${PROD_DIR}/
for CASE in "ECMWF" "COARE3p6" "NCAR" "ECMWF-noskin" "COARE3p6-noskin"; do
@@ -64,8 +86,8 @@
scase=`echo "${CASE}" | tr '[:upper:]' '[:lower:]'`
- rm -f ${WORK_DIR}/namelist_cfg
- rsync -avPL ${NEMO_EXPREF}/namelist_${scase}_cfg ${WORK_DIR}/namelist_cfg
+ rm -f ${PROD_DIR}/namelist_cfg
+ rsync -avPL ${NEMO_EXPREF}/namelist_${scase}_cfg ${PROD_DIR}/namelist_cfg
- cd ${WORK_DIR}/
+ cd ${PROD_DIR}/
echo
echo "Launching NEMO !"
Index: /NEMO/branches/2020/dev_r12953_ENHANCE-10_acc_fix_traqsr/tests/STATION_ASF/MY_SRC/stpctl.F90
===================================================================
--- /NEMO/branches/2020/dev_r12953_ENHANCE-10_acc_fix_traqsr/tests/STATION_ASF/MY_SRC/stpctl.F90 (revision 13194)
+++ /NEMO/branches/2020/dev_r12953_ENHANCE-10_acc_fix_traqsr/tests/STATION_ASF/MY_SRC/stpctl.F90 (revision 13195)
@@ -111,7 +111,15 @@
! !== done by all processes at every time step ==!
llmsk(:,:) = tmask(:,:,1) == 1._wp
- zmax(1) = MAXVAL( taum(:,:) , mask = llmsk ) ! max wind stress module
- zmax(2) = MAXVAL( ABS( qns(:,:) ) , mask = llmsk ) ! max non-solar heat flux
- zmax(3) = MAXVAL( ABS( emp(:,:) ) , mask = llmsk ) ! max E-P
+ IF( COUNT( llmsk(:,:) ) > 0 ) THEN ! avoid huge values sent back for land processors...
+ zmax(1) = MAXVAL( taum(:,:) , mask = llmsk ) ! max wind stress module
+ zmax(2) = MAXVAL( ABS( qns(:,:) ) , mask = llmsk ) ! max non-solar heat flux
+ zmax(3) = MAXVAL( ABS( emp(:,:) ) , mask = llmsk ) ! max E-P
+ ELSE
+ IF( ll_colruns ) THEN ! default value: must not be kept when calling mpp_max -> must be as small as possible
+ zmax(1:3) = -HUGE(1._wp)
+ ELSE ! default value: must not give true for any of the tests bellow (-> avoid manipulating HUGE...)
+ zmax(1:3) = 0._wp
+ ENDIF
+ ENDIF
zmax(4) = REAL( nstop, wp ) ! stop indicator
! !== get global extrema ==!
Index: /NEMO/branches/2020/dev_r12953_ENHANCE-10_acc_fix_traqsr/tests/STATION_ASF/README.md
===================================================================
--- /NEMO/branches/2020/dev_r12953_ENHANCE-10_acc_fix_traqsr/tests/STATION_ASF/README.md (revision 13194)
+++ /NEMO/branches/2020/dev_r12953_ENHANCE-10_acc_fix_traqsr/tests/STATION_ASF/README.md (revision 13195)
@@ -1,4 +1,8 @@
## WARNING: TOTALLY-ALPHA-STUFF / DOCUMENT IN THE PROCESS OF BEING WRITEN!
+
+NOTE: if working with the trunk of NEMO, you are strongly advised to use the same test-case but on the `NEMO-examples` GitHub depo:
+https://github.com/NEMO-ocean/NEMO-examples/tree/master/STATION_ASF
+
# *Station Air-Sea Fluxes* demonstration case