New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 13733 – NEMO

Changeset 13733


Ignore:
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
Files:
11 edited
1 moved

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/cfgs/C1D_PAPA/EXPREF/namelist_cfg

    r13558 r13733  
    428428/ 
    429429!----------------------------------------------------------------------- 
    430 !----------------------------------------------------------------------- 
    431 / 
    432 !----------------------------------------------------------------------- 
    433430&namhsb        !  Heat and salt budgets                                 (default: OFF) 
    434431!----------------------------------------------------------------------- 

  • NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/cfgs/ORCA2_OFF_PISCES/EXPREF/namelist_cfg

    r13558 r13733  
    388388/ 
    389389!----------------------------------------------------------------------- 
    390 !----------------------------------------------------------------------- 
    391 / 
    392 !----------------------------------------------------------------------- 
    393390&namhsb        !  Heat and salt budgets                                 (default: OFF) 
    394391!----------------------------------------------------------------------- 

  • NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/cfgs/ORCA2_OFF_TRC/EXPREF/namelist_cfg

    r13558 r13733  
    384384/ 
    385385!----------------------------------------------------------------------- 
    386 !----------------------------------------------------------------------- 
    387 / 
    388 !----------------------------------------------------------------------- 
    389386&namhsb        !  Heat and salt budgets                                 (default: OFF) 
    390387!----------------------------------------------------------------------- 

  • NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/cfgs/SHARED/namelist_ref

    r13656 r13733  
    12781278!!gm   ln_trdmld_instant = .false.         !  flag to diagnose trends of instantantaneous or mean ML T/S 
    12791279!!gm 
    1280 / 
    12811280!----------------------------------------------------------------------- 
    12821281&namhsb        !  Heat and salt budgets                                 (default: OFF) 

  • NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/cfgs/WED025/EXPREF/namelist_cfg

    r13558 r13733  
    583583/ 
    584584!----------------------------------------------------------------------- 
    585 !----------------------------------------------------------------------- 
    586 / 
    587 !----------------------------------------------------------------------- 
    588585&namhsb        !  Heat and salt budgets                                 (default: OFF) 
    589586!----------------------------------------------------------------------- 

  • NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/src/ICE/icestp.F90

    r13655 r13733  
    212212      ! --- Ocean time step --- ! 
    213213      !-------------------------! 
    214       IF( ln_icedyn )                   CALL ice_update_tau( kt, uu(:,:,1,Kbb), vv(:,:,1,Kbb) )   ! -- update surface ocean stresses 
     214      CALL ice_update_tau( kt, uu(:,:,1,Kbb), vv(:,:,1,Kbb) )         ! -- update surface ocean stresses 
    215215!!gm   remark, the ocean-ice stress is not saved in ice diag call above .....  find a solution!!! 
    216216      ! 

  • NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/ISOMIP+/EXPREF/namelist_cfg

    r13558 r13733  
    477477/ 
    478478!----------------------------------------------------------------------- 
    479 !----------------------------------------------------------------------- 
    480 / 
    481 !----------------------------------------------------------------------- 
    482479&namhsb        !  Heat and salt budgets                                 (default: OFF) 
    483480!----------------------------------------------------------------------- 

  • NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/ISOMIP/EXPREF/namelist_cfg

    r13558 r13733  
    437437/ 
    438438!----------------------------------------------------------------------- 
    439 !----------------------------------------------------------------------- 
    440 / 
    441 !----------------------------------------------------------------------- 
    442439&namhsb        !  Heat and salt budgets                                 (default: OFF) 
    443440!----------------------------------------------------------------------- 

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

    r13686 r13733  
    258258 
    259259# Conclusion: 
     260clist='' 
     261for cc in l_var_ot: clist=clist+cc+', ' 
     262cbla = ' Test performed on the following NEMO prognostic variables:\n   ==> '+clist[:-2]+'\n' 
     263print(ccol+cbla+fclrs.ENDC ) ; f.write(cbla+'\n') 
    260264 
    261265cbla = '    ####################################\n'  +\ 

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

    r13719 r13733  
    1818#     => i_sea_ice: whether to compute fluxes over sea-ice as well 
    1919#     => SFORC: string sufficient to copy relevant files as in "*${SFORC}*.nc" 
    20 #FORCING="PAPA"         ; i_sea_ice=0 ; SFORC="Station_PAPA_50N-145W" 
    21 FORCING="ERA5_arctic" ; i_sea_ice=1 ; SFORC="ERA5_arctic_surface_81N_36p75E_1h" ; # "ERA5_arctic" WITH ice/air flux computation 
     20FORCING="PAPA"         ; i_sea_ice=0 ; SFORC="Station_PAPA_50N-145W" 
     21#FORCING="ERA5_arctic" ; i_sea_ice=1 ; SFORC="ERA5_arctic_surface_81N_36p75E_1h" ; # "ERA5_arctic" WITH ice/air flux computation 
    2222#FORCING="ERA5_arctic" ; i_sea_ice=0 ; SFORC="ERA5_arctic_surface_81N_36p75E_1h" ; # "ERA5_arctic" WITHOUT ice/air flux computation 
    2323 
    … …  
    3535PROD_DIR="${HOME}/tmp/${CONFIG}" 
    3636 
    37  
    38  
    39  
    40  
    41  
     37# MPI launch command for your system 
     38# Even though we are running on 1 proc, NEMO has been compiled with MPI, so fill the following: 
     39MPI_LAUNCH="mpirun -n 1" 
    4240 
    4341####### End of normal user configurable section ####### 
    … …  
    4543#================================================================================ 
    4644 
     45iconv_1d=1 
    4746if [ "`which ncks`" = "" ]; then 
    4847    echo 
    4948    echo "WARNING: you do not seem to have NCO installed here... You should!" 
    50     echo "      => anyway! will do without, output fields will remaine 3x3 in space :( " 
     49    echo "      => anyway! will do without, but output netCDF files will remaine 3x3 in space :( " 
    5150    echo 
    52     sleep 4 
     51    iconv_1d=0 
     52    sleep 3 
    5353fi 
    5454 
    … …  
    195195            rsync -avPL ${CFGS_SHARED}/namelist_ice_ref ${PROD_DIR}/namelist_ice_ref 
    196196        fi 
    197          
     197     
    198198        cd ${PROD_DIR}/ 
    199199        echo 
    200         echo "Launching NEMO !" 
    201         ./nemo.exe 1>out_nemo.out 2>err_nemo.err 
     200        echo "Launching NEMO ! (==> ${MPI_LAUNCH} ./nemo.exe)" 
     201        ${MPI_LAUNCH} ./nemo.exe 1>out_nemo.out 2>err_nemo.err 
    202202        echo "Done!" 
    203203        echo 
    … …  
    212212        mv -f *.out *.err ocean.output output.namelist.dyn ${CASE}_${FORCING}_log/ 
    213213 
     214        if [ ${iconv_1d} -eq 1 ]; then 
    214215        # Making 3x3 to 1 ! 
    215216        cd output/ 
    … …  
    222223            echo 
    223224        done 
     225        fi 
    224226 
    225227    done 

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

    r13732 r13733  
    1515#       fluxes over open water. 
    1616# 
    17 # 
    18 # 
    19 # 
    20 # 
    2117################################################################ 
    2218 
    … …  
    3834 
    3935# Directory where to run the simulation: 
    40 PROD_DIR="${HOME}/tmp/${CONFIG}" 
    41  
    42  
    43  
    44  
     36PROD_DIR="${HOME}/tmp/${CONFIG}_test" 
     37 
     38# MPI launch command for your system 
     39# Even though we are running on 1 proc here, NEMO has likely been compiled with MPI, 
     40# if it's not the case then just leave "MPI_LAUNCH" void... 
     41MPI_LAUNCH="mpirun -n 1" 
    4542 
    4643####### End of normal user configurable section ####### 
    47  
    4844#================================================================================ 
     45 
     46 
    4947 
    5048# Should the `analyze_output.py` script provide more output ??? 
    … …  
    5856    fi 
    5957fi 
    60  
    61  
    6258 
    6359rm -f SBCBLK.success SBCBLK.fail 
    … …  
    180176        cd ${PROD_DIR}/ 
    181177        echo 
    182         echo "Launching NEMO !" 
    183         ./nemo.exe 1>out_nemo.out 2>err_nemo.err 
     178        echo "Launching NEMO ! (==> ${MPI_LAUNCH} ./nemo.exe)" 
     179        ${MPI_LAUNCH} ./nemo.exe 1>out_nemo.out 2>err_nemo.err 
    184180        echo "Done!" 
    185181        echo 

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

    r13682 r13733  
    9696Move to: ```tests/STATION_ASF/EXPREF/``` 
    9797 
    98 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). 
     98There, 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). 
    9999 
    100100Launch the script: 
    101101 
    102     $ ./sbcblk_sanity_check.sh 
     102    $ ./sanity_check_SBCBLK.sh 
    103103 
    104104 
    … …  
    108108- `SBCBLK.fail` the test failed :( 
    109109 
    110 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:  
     110In 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:  
    111111 
    112     $ ./sbcblk_sanity_check.sh more 
     112    $ ./sanity_check_SBCBLK.sh more 
    113113 
    114114 This will generate more output such as figure of time series for the tested variables. 
Note: See TracChangeset for help on using the changeset viewer.