Changeset 13733 for NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/STATION_ASF

Timestamp:

2020-11-06T11:58:31+01:00 (4 years ago)

Author:

laurent

Message:

Keep up with trunk r13732 + improvements STATION_ASF (ocean & ice).

Location:

NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/STATION_ASF

Files:

• EXPREF/analyze_output.py (modified) (1 diff)
• EXPREF/launch_sasf.sh (modified) (6 diffs)
• EXPREF/sanity_check_SBCBLK.sh (moved) (moved from NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/STATION_ASF/EXPREF/sbcblk_sanity_check.sh) (4 diffs)
• README.md (modified) (2 diffs)

NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/STATION_ASF/EXPREF/analyze_output.py

@@ -258 +258 @@
 
 # Conclusion:
+clist=''
+for cc in l_var_ot: clist=clist+cc+', '
+cbla = ' Test performed on the following NEMO prognostic variables:\n   ==> '+clist[:-2]+'\n'
+print(ccol+cbla+fclrs.ENDC ) ; f.write(cbla+'\n')
 
 cbla = '    ####################################\n'  +\

NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/STATION_ASF/EXPREF/launch_sasf.sh

@@ -18 +18 @@
 #     => i_sea_ice: whether to compute fluxes over sea-ice as well
 #     => SFORC: string sufficient to copy relevant files as in "*${SFORC}*.nc"
-#FORCING="PAPA"         ; i_sea_ice=0 ; SFORC="Station_PAPA_50N-145W"
-FORCING="ERA5_arctic" ; i_sea_ice=1 ; SFORC="ERA5_arctic_surface_81N_36p75E_1h" ; # "ERA5_arctic" WITH ice/air flux computation
+FORCING="PAPA"         ; i_sea_ice=0 ; SFORC="Station_PAPA_50N-145W"
+#FORCING="ERA5_arctic" ; i_sea_ice=1 ; SFORC="ERA5_arctic_surface_81N_36p75E_1h" ; # "ERA5_arctic" WITH ice/air flux computation
 #FORCING="ERA5_arctic" ; i_sea_ice=0 ; SFORC="ERA5_arctic_surface_81N_36p75E_1h" ; # "ERA5_arctic" WITHOUT ice/air flux computation
 
@@ -35 +35 @@
 PROD_DIR="${HOME}/tmp/${CONFIG}"
 
-
-
-
-
-
+# MPI launch command for your system
+# Even though we are running on 1 proc, NEMO has been compiled with MPI, so fill the following:
+MPI_LAUNCH="mpirun -n 1"
 
 ####### End of normal user configurable section #######
@@ -45 +43 @@
 #================================================================================
 
+iconv_1d=1
 if [ "`which ncks`" = "" ]; then
     echo
     echo "WARNING: you do not seem to have NCO installed here... You should!"
-    echo "      => anyway! will do without, output fields will remaine 3x3 in space :( "
+    echo "      => anyway! will do without, but output netCDF files will remaine 3x3 in space :( "
     echo
-    sleep 4
+    iconv_1d=0
+    sleep 3
 fi
 
@@ -195 +195 @@
             rsync -avPL ${CFGS_SHARED}/namelist_ice_ref ${PROD_DIR}/namelist_ice_ref
         fi
-        
+    
         cd ${PROD_DIR}/
         echo
-        echo "Launching NEMO !"
-        ./nemo.exe 1>out_nemo.out 2>err_nemo.err
+        echo "Launching NEMO ! (==> ${MPI_LAUNCH} ./nemo.exe)"
+        ${MPI_LAUNCH} ./nemo.exe 1>out_nemo.out 2>err_nemo.err
         echo "Done!"
         echo
@@ -212 +212 @@
         mv -f *.out *.err ocean.output output.namelist.dyn ${CASE}_${FORCING}_log/
 
+        if [ ${iconv_1d} -eq 1 ]; then
         # Making 3x3 to 1 !
         cd output/
@@ -222 +223 @@
             echo
         done
+        fi
 
     done

NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/STATION_ASF/EXPREF/sanity_check_SBCBLK.sh

@@ -15 +15 @@
 #       fluxes over open water.
 #
-#
-#
-#
-#
 ################################################################
 
@@ -38 +34 @@
 
 # Directory where to run the simulation:
-PROD_DIR="${HOME}/tmp/${CONFIG}"
-
-
-
-
+PROD_DIR="${HOME}/tmp/${CONFIG}_test"
+
+# MPI launch command for your system
+# Even though we are running on 1 proc here, NEMO has likely been compiled with MPI,
+# if it's not the case then just leave "MPI_LAUNCH" void...
+MPI_LAUNCH="mpirun -n 1"
 
 ####### End of normal user configurable section #######
-
 #================================================================================
+
+
 
 # Should the `analyze_output.py` script provide more output ???
@@ -58 +56 @@
     fi
 fi
-
-
 
 rm -f SBCBLK.success SBCBLK.fail
@@ -180 +176 @@
         cd ${PROD_DIR}/
         echo
-        echo "Launching NEMO !"
-        ./nemo.exe 1>out_nemo.out 2>err_nemo.err
+        echo "Launching NEMO ! (==> ${MPI_LAUNCH} ./nemo.exe)"
+        ${MPI_LAUNCH} ./nemo.exe 1>out_nemo.out 2>err_nemo.err
         echo "Done!"
         echo

NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/STATION_ASF/README.md

@@ -96 +96 @@
 Move to: ```tests/STATION_ASF/EXPREF/```
 
-There, in script ``sbcblk_sanity_check.sh``, double check that the variables given a value in the first lines are consistent with your setup (it should).
+There, in script ``sanity_check_SBCBLK.sh``, double check that the variables given a value in the first lines are consistent with your setup (it should).
 
 Launch the script:
 
-    $ ./sbcblk_sanity_check.sh
+    $ ./sanity_check_SBCBLK.sh
 
 
@@ -108 +108 @@
 - `SBCBLK.fail` the test failed :(
 
-In case of failure, read the rapport to know which algorithm/computed variables did not pass the test... You should also re-run the script ``sbcblk_sanity_check.sh`` with the "more" argument: 
+In case of failure, read the rapport to know which algorithm/computed variables did not pass the test... You should also re-run the script `sanity_check_SBCBLK.sh` with the "more" argument: 
 
-    $ ./sbcblk_sanity_check.sh more
+    $ ./sanity_check_SBCBLK.sh more
 
  This will generate more output such as figure of time series for the tested variables.