Changeset 13686


Ignore:
Timestamp:
2020-10-28T10:56:07+01:00 (6 months ago)
Author:
laurent
Message:

Improvements for "oce+ice capable" STATION_ASF!

Location:
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/STATION_ASF
Files:
3 edited

Legend:

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

    r13682 r13686  
    135135    cv_rf_t = cv+'_tol' 
    136136    cv_nemo = l_var_ot[jv] 
    137     print('\n\n ==== Checking flux '+cv_rf_m+' ('+cv_nemo+') !') 
     137    print('\n\n ==== Checking variable '+cv_nemo+' against '+cv_rf_m+' !') 
    138138 
    139139    F_rf_m = nmp.zeros( Nt ) 
  • NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/STATION_ASF/EXPREF/sbcblk_sanity_check.sh

    r13682 r13686  
    7070i_si3=0 
    7171FCPP="${SASF_WRK_DIR}/cpp_${CONFIG_BLD}.fcm" 
    72 if [ ! -f ${FCPP} ]; then echo " Mhhh, we did not find 'cpp_STATION_ASF.fcm' into `dirname ${FCPP}` !"; exit; fi 
     72if [ ! -f ${FCPP} ]; then echo " Mhhh, we could not find 'cpp_STATION_ASF.fcm' into `dirname ${FCPP}` !"; exit; fi 
    7373ca=`cat ${FCPP} | grep 'key_si3'` 
    7474 
     
    9595 
    9696 
    97 if [ ! -d ${DATA_IN_DIR} ]; then echo "PROBLEM!!! => did not find directory 'input_data' with input forcing..."; exit; fi 
     97CFGS_SHARED="${NEMO_REF_DIR}/cfgs/SHARED" 
     98if [ ! -d ${CFGS_SHARED} ]; then echo "PROBLEM!!! => could not find directory ${CFGS_SHARED} !"; exit; fi 
     99 
     100if [ ! -d ${DATA_IN_DIR} ]; then echo "PROBLEM!!! => could not find directory 'input_data' with input forcing..."; exit; fi 
    98101 
    99102cdt_cmpl="`\ls -l ${NEMO_EXE} | cut -d' ' -f 6,7,8`" 
     
    124127################ 
    125128 
    126 list_xml="iodef.xml file_def_nemo-oce.xml field_def_nemo-oce.xml" 
     129list_xml_ref="field_def_nemo-oce.xml domain_def_nemo.xml grid_def_nemo.xml" 
     130list_xml_cfg="iodef.xml file_def_nemo-oce.xml" 
    127131fcntxt="context_nemo_OCE.xml" 
    128132if [ ${i_sea_ice} -eq 1 ]; then 
    129     list_xml+=" file_def_nemo-ice.xml field_def_nemo-ice.xml" 
     133    list_xml_ref+=" field_def_nemo-ice.xml" 
     134    list_xml_cfg+=" file_def_nemo-ice.xml" 
    130135    fcntxt="context_nemo_OCE+ICE.xml" 
    131136fi 
     
    136141 
    137142# All remaining "*.xml" files: 
    138 for ff in ${list_xml} ; do 
     143for ff in ${list_xml_cfg} ; do 
    139144    if [ ! -f ${SASF_EXPREF}/${ff} ]; then echo " Mhhh, ${ff} not found into ${SASF_EXPREF} !"; exit; fi 
    140145    rsync -avPL ${SASF_EXPREF}/${ff} ${PROD_DIR}/ 
    141146done 
    142  
    143  
    144 # Getting reference/defaults files from reference NEMO distro: 
    145 rdir="${NEMO_REF_DIR}/cfgs/SHARED" 
    146 for ff in "domain_def_nemo.xml" "grid_def_nemo.xml"; do 
    147     if [ ! -f ${rdir}/${ff} ]; then echo " Mhhh, ${ff} not found into ${rdir} !"; exit; fi 
    148     ln -sf ${rdir}/${ff} ${PROD_DIR}/. 
     147for ff in ${list_xml_ref} ; do 
     148    if [ ! -f ${CFGS_SHARED}/${ff} ]; then echo " Mhhh, ${ff} not found into ${CFGS_SHARED} !"; exit; fi 
     149    rsync -avPL ${CFGS_SHARED}/${ff} ${PROD_DIR}/ 
    149150done 
    150151 
     
    175176        # The namelists: 
    176177        rsync -avPL ${SASF_EXPREF}/${DIR_NL}/namelist_${scase}_cfg ${PROD_DIR}/namelist_cfg 
    177         rsync -avPL ${SASF_EXPREF}/namelist_ref                   ${PROD_DIR}/namelist_ref 
     178        rsync -avPL ${CFGS_SHARED}/namelist_ref                    ${PROD_DIR}/namelist_ref 
    178179     
    179180        cd ${PROD_DIR}/ 
  • NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/STATION_ASF/MY_SRC/icestp.F90

    r13655 r13686  
    7474   !!---------------------------------------------------------------------- 
    7575   !! NEMO/ICE 4.0 , NEMO Consortium (2018) 
    76    !! $Id: icestp.F90 13641 2020-10-19 18:16:58Z clem $ 
     76   !! $Id: icestp.F90 13655 2020-10-21 14:15:13Z laurent $ 
    7777   !! Software governed by the CeCILL license (see ./LICENSE) 
    7878   !!---------------------------------------------------------------------- 
     
    127127         !    utau_ice, vtau_ice = surface ice stress [N/m2] 
    128128         !------------------------------------------------! 
     129                                        CALL ice_sbc_tau( kt, ksbc, utau_ice, vtau_ice ) 
     130         ! 
    129131         !------------------------------------------------------! 
    130132         ! --- Thermodynamical coupling with the atmosphere --- ! 
     
    150152         !!============================================================= 
    151153 
    152          !IF(lwp) WRITE(numout,*) '' 
    153          !IF(lwp) WRITE(numout,*) 'LOLO:ice_stp()@icestp.F90 => calling "ice_update_flx()" at kt =', kt 
    154          !                               CALL ice_update_flx( kt )     ! -- Update ocean surface mass, heat and salt fluxes 
    155          !IF(lwp) WRITE(numout,*) 'LOLO:ice_stp()@icestp.F90 => Done with "ice_update_flx()" at kt =', kt 
    156          !IF(lwp) WRITE(numout,*) '' 
    157  
    158154         ! --- case we bypass ice thermodynamics --- ! 
    159155         !IF( .NOT. ln_icethd ) THEN   ! we suppose ice is impermeable => ocean is isolated from atmosphere 
     
    196192      ! --- Ocean time step --- ! 
    197193      !-------------------------! 
    198       !IF( ln_icedyn )                   CALL ice_update_tau( kt, uu(:,:,1,Kbb), vv(:,:,1,Kbb) )   ! -- update surface ocean stresses 
    199       !!gm   remark, the ocean-ice stress is not saved in ice diag call above .....  find a solution!!! 
    200194      ! 
    201195      IF( ln_timing )   CALL timing_stop('ice_stp') 
     
    238232      ! 
    239233      CALL ice_sbc_init                ! set ice-ocean and ice-atm. coupling parameters 
     234      ! 
     235      fr_i  (:,:)   = at_i(:,:)        ! initialisation of sea-ice fraction 
    240236      ! 
    241237      IF( ln_rstart )   CALL iom_close( numrir )  ! close input ice restart file 
Note: See TracChangeset for help on using the changeset viewer.