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 2409 for branches/nemo_v3_3_beta – NEMO

Ignore:
Timestamp:
2010-11-19T16:30:38+01:00 (13 years ago)
Author:
cetlod
Message:

Finalize the new organisation of 1D vertical configuration, see ticket #760

Location:
branches/nemo_v3_3_beta/NEMOGCM
Files:
4 added
7 edited

Legend:

Unmodified
Added
Removed

  • branches/nemo_v3_3_beta/NEMOGCM/CONFIG/makenemo

    r2385 r2409  
    224224   . ${COMPIL_DIR}/Fread_dir.sh LIM_SRC_3   NO   
    225225   . ${COMPIL_DIR}/Fread_dir.sh TOP_SRC    NO   
    226    . ${COMPIL_DIR}/Fread_dir.sh C1D_SRC    YES  
    227226   . ${COMPIL_DIR}/Fread_dir.sh NST_SRC    YES  
    228227   . ${COMPIL_DIR}/Fread_dir.sh OFF_SRC    NO   

  • branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_clio.F90

    r2370 r2409  
    3737   USE ice_2 
    3838#endif 
     39 
    3940   IMPLICIT NONE 
    4041   PRIVATE 
    … …  
    176177      tatm_ice(:,:) = sf(jp_tair)%fnow(:,:,1)     !RB ugly patch 
    177178#endif 
    178       ! 
    179       IF(lwp .AND. nitend-nit000 <= 100 ) THEN 
    180          IF( MOD( kt-1, nn_fsbc ) == 0 ) THEN 
    181             WRITE(numout,*) 
    182             WRITE(numout,*) ' read monthly CLIO fluxes: ok, kt: ', kt 
    183             WRITE(numout,*) 
    184             ifpr = INT(jpi/8)      ;      jfpr = INT(jpj/10) 
    185             WRITE(numout,*) TRIM(sf(jp_utau)%clvar),' day: ',ndastp 
    186             CALL prihre( sf(jp_utau)%fnow,jpi,jpj,1,jpi,ifpr,1,jpj,jfpr,0.,numout ) 
    187             WRITE(numout,*) 
    188             WRITE(numout,*) TRIM(sf(jp_vtau)%clvar),' day: ',ndastp 
    189             CALL prihre( sf(jp_vtau)%fnow,jpi,jpj,1,jpi,ifpr,1,jpj,jfpr,0.,numout ) 
    190             WRITE(numout,*) 
    191             WRITE(numout,*) TRIM(sf(jp_humi)%clvar),' day: ',ndastp 
    192             CALL prihre( sf(jp_humi)%fnow,jpi,jpj,1,jpi,ifpr,1,jpj,jfpr,0.,numout ) 
    193             WRITE(numout,*) 
    194             WRITE(numout,*) TRIM(sf(jp_wndm)%clvar),' day: ',ndastp 
    195             CALL prihre( sf(jp_wndm)%fnow,jpi,jpj,1,jpi,ifpr,1,jpj,jfpr,0.,numout ) 
    196             WRITE(numout,*) 
    197             WRITE(numout,*) TRIM(sf(jp_ccov)%clvar),' day: ',ndastp 
    198             CALL prihre( sf(jp_ccov)%fnow,jpi,jpj,1,jpi,ifpr,1,jpj,jfpr,0.,numout ) 
    199             WRITE(numout,*) 
    200             WRITE(numout,*) TRIM(sf(jp_prec)%clvar),' day: ',ndastp 
    201             CALL prihre( sf(jp_prec)%fnow,jpi,jpj,1,jpi,ifpr,1,jpj,jfpr,0.,numout ) 
    202             WRITE(numout,*) 
    203             WRITE(numout,*) TRIM(sf(jp_tair)%clvar),' day: ',ndastp 
    204             CALL prihre( sf(jp_tair)%fnow,jpi,jpj,1,jpi,ifpr,1,jpj,jfpr,0.,numout ) 
    205             WRITE(numout,*) 
    206          ENDIF 
    207       ENDIF 
    208  
    209       IF( MOD( kt - 1, nn_fsbc ) == 0 ) THEN 
    210           CALL blk_oce_clio( sf, sst_m )                  ! compute the surface ocean fluxes using CLIO bulk formulea 
    211       ENDIF                                               !  
     179      !                                                        ! surface ocean fluxes computed with CLIO bulk formulea 
     180      IF( MOD( kt - 1, nn_fsbc ) == 0 )   CALL blk_oce_clio( sf, sst_m ) 
    212181      ! 
    213182   END SUBROUTINE sbc_blk_clio 

  • branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90

    r2397 r2409  
    12681268   LOGICAL, PUBLIC, PARAMETER ::   lk_zdfgls = .FALSE.   !: TKE flag 
    12691269CONTAINS 
     1270   SUBROUTINE zdf_gls_init           ! Empty routine 
     1271      WRITE(*,*) 'zdf_gls_init: You should not have seen this print! error?' 
     1272   END SUBROUTINE zdf_gls_init 
    12701273   SUBROUTINE zdf_gls( kt )          ! Empty routine 
    12711274      WRITE(*,*) 'zdf_gls: You should not have seen this print! error?', kt 

  • branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfkpp.F90

    r2287 r2409  
    15331533      WRITE(*,*) 'tra_kpp: You should not have seen this print! error?', kt 
    15341534   END SUBROUTINE tra_kpp 
     1535#if defined key_top 
     1536   SUBROUTINE trc_kpp( kt )          ! Dummy routine 
     1537      WRITE(*,*) 'trc_kpp: You should not have seen this print! error?', kt 
     1538   END SUBROUTINE trc_kpp 
     1539#endif 
    15351540#endif 
    15361541 

  • branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/opa.F90

    r2392 r2409  
    408408      ENDIF 
    409409      ! 
     410      IF( lk_c1d .AND. .NOT. lk_iomput )  & 
     411        CALL ctl_stop( ' The 1D vertical configuration must be used in conjunction',   & 
     412            &          ' with the IOM Input/Output manager. Compile with key_iomput enabled' ) 
     413      ! 
    410414   END SUBROUTINE opa_ctl 
    411415 

  • branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/stpctl.F90

    r2287 r2409  
    2121   USE lib_mpp         ! distributed memory computing 
    2222   USE dynspg_oce      ! pressure gradient schemes  
     23   USE c1d             ! 1D vertical configuration 
    2324 
    2425   IMPLICIT NONE 
    … …  
    1391409500  FORMAT (' kt=',i6,' min SSS: ',1pg11.4,', i j: ',2i5) 
    140141 
     142       
     143      IF( lk_c1d )  RETURN          ! No log file in case of 1D vertical configuration 
     144 
    141145      ! log file (solver or ssh statistics) 
    142146      ! -------- 

  • branches/nemo_v3_3_beta/NEMOGCM/TOOLS/COMPILE/cfg.txt

    r2370 r2409  
    11GYRE OPA_SRC 
    2 ORCA2_LIM_PISCES OPA_SRC LIM_SRC_2 NST_SRC C1D_SRC TOP_SRC 
     2ORCA2_LIM_PISCES OPA_SRC LIM_SRC_2 NST_SRC TOP_SRC 
    33GYRE_LOBSTER OPA_SRC TOP_SRC 
    44ORCA2_OFF_PISCES OPA_SRC OFF_SRC TOP_SRC 
    55POMME OPA_SRC NST_SRC 
    66ORCA2_LIM3 OPA_SRC LIM_SRC_3 
    7 ORCA2_LIM OPA_SRC LIM_SRC_2 NST_SRC C1D_SRC 
     7ORCA2_LIM OPA_SRC LIM_SRC_2 NST_SRC  
Note: See TracChangeset for help on using the changeset viewer.