Changeset 9570 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/DIA
- Timestamp:
- 2018-05-11T12:53:25+02:00 (6 years ago)
- Location:
- branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC
- Files:
-
- 11 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/DIA/dia25h.F90
r9168 r9570 32 32 33 33 !!---------------------------------------------------------------------- 34 !! NEMO/O PA3.6 , NEMO Consortium (2014)34 !! NEMO/OCE 3.6 , NEMO Consortium (2014) 35 35 !! $Id:$ 36 36 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) … … 109 109 rmxln_25h(:,:,:) = hmxl_n(:,:,:) 110 110 ENDIF 111 #if defined key_ lim3111 #if defined key_si3 112 112 CALL ctl_stop('STOP', 'dia_25h not setup yet to do tidemean ice') 113 113 #endif -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/DIA/diaar5.F90
r9125 r9570 41 41 # include "vectopt_loop_substitute.h90" 42 42 !!---------------------------------------------------------------------- 43 !! NEMO/O PA3.3 , NEMO Consortium (2010)43 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 44 44 !! $Id$ 45 45 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/DIA/diacfl.F90
r9124 r9570 39 39 # include "vectopt_loop_substitute.h90" 40 40 !!---------------------------------------------------------------------- 41 !! NEMO/O PA3.2 , LOCEAN-IPSL (2009)41 !! NEMO/OCE 3.2 , LOCEAN-IPSL (2009) 42 42 !! $Id$ 43 43 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/DIA/diadct.F90
r9125 r9570 32 32 USE dianam ! build name of file 33 33 USE lib_mpp ! distributed memory computing library 34 #if defined key_ lim334 #if defined key_si3 35 35 USE ice 36 36 #endif … … 98 98 99 99 !!---------------------------------------------------------------------- 100 !! NEMO/O PA3.3 , NEMO Consortium (2010)100 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 101 101 !! $Id$ 102 102 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) … … 724 724 END DO !end of loop on the level 725 725 726 #if defined key_ lim3726 #if defined key_si3 727 727 728 728 !ICE CASE … … 746 746 zTnorm=zumid_ice*e2u(k%I,k%J)+zvmid_ice*e1v(k%I,k%J) 747 747 748 #if defined key_ lim3748 #if defined key_si3 749 749 DO jl=1,jpl 750 750 transports_2d(1,jsec,jseg) = transports_2d(1,jsec,jseg) + (zTnorm)* & … … 929 929 END DO ! loop over jk 930 930 931 #if defined key_ lim3931 #if defined key_si3 932 932 933 933 !ICE CASE -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/DIA/diaharm.F90
r9168 r9570 55 55 56 56 !!---------------------------------------------------------------------- 57 !! NEMO/O PA3.5 , NEMO Consortium (2013)57 !! NEMO/OCE 3.5 , NEMO Consortium (2013) 58 58 !! $Id$ 59 59 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/DIA/diahsb.F90
r9367 r9570 52 52 # include "vectopt_loop_substitute.h90" 53 53 !!---------------------------------------------------------------------- 54 !! NEMO/O PA3.3 , NEMO Consortium (2010)54 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 55 55 !! $Id$ 56 56 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/DIA/diahth.F90
r9124 r9570 41 41 42 42 !!---------------------------------------------------------------------- 43 !! NEMO/O PA4.0 , NEMO Consortium (2011)43 !! NEMO/OCE 4.0 , NEMO Consortium (2011) 44 44 !! $Id$ 45 45 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/DIA/dianam.F90
r6140 r9570 23 23 24 24 !!---------------------------------------------------------------------- 25 !! NEMO/O PA3.3 , NEMO Consortium (2010)25 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 26 26 !! $Id$ 27 27 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/DIA/diaptr.F90
r9124 r9570 65 65 # include "vectopt_loop_substitute.h90" 66 66 !!---------------------------------------------------------------------- 67 !! NEMO/O PA3.3 , NEMO Consortium (2010)67 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 68 68 !! $Id$ 69 69 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/DIA/diatmb.F90
r9490 r9570 21 21 22 22 !!---------------------------------------------------------------------- 23 !! NEMO/O PA3.6 , NEMO Consortium (2014)23 !! NEMO/OCE 3.6 , NEMO Consortium (2014) 24 24 !! $Id:$ 25 25 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/DIA/diawri.F90
r9399 r9570 51 51 USE ioipsl ! 52 52 53 #if defined key_ lim353 #if defined key_si3 54 54 USE icewri 55 55 #endif … … 79 79 # include "vectopt_loop_substitute.h90" 80 80 !!---------------------------------------------------------------------- 81 !! NEMO/O PA3.3 , NEMO Consortium (2010)81 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 82 82 !! $Id$ 83 83 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) … … 971 971 ENDIF 972 972 973 #if defined key_ lim3973 #if defined key_si3 974 974 IF( nn_ice == 2 ) THEN ! condition needed in case agrif + ice-model but no-ice in child grid 975 975 CALL ice_wri_state( kt, id_i, nh_i )
Note: See TracChangeset
for help on using the changeset viewer.