Context Navigation

← Previous Change
Next Change →

Changeset 3356 for LMDZ6/branches/DYNAMICO-conv/libf/phylmd/iophys.F90

Timestamp:

Jun 29, 2018, 12:31:11 PM (6 years ago)

Author:

Laurent Fairhead

Message:

First attempt at merging with trunk

Location:

LMDZ6/branches/DYNAMICO-conv

Files:

: 2 edited

. (modified) (1 prop)
libf/phylmd/iophys.F90 (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

LMDZ6/branches/DYNAMICO-conv

Property svn:mergeinfo changed

/LMDZ6/trunk (added)

merged: 3025-3027,3029,3031,3033-3039,3041,3043,3045,3047-3048,3051,3053,3057,3059-3060,3066,3068-3075,3078,3080,3082-3084,3086-3087,3090,3094-3117,3119,3121-3126,3129-3132,3134,3136-3137,3141-3144,3146,3148-3156,3159,3161-3163,3165,3167-3169,3171-3172,3174,3178-3182,3184,3186,3188,3192,3194-3199,3202,3206,3208-3211,3214,3216-3217,3219,3221,3223,3225-3226,3228,3231-3234,3237-3239,3241,3244-3245,3247,3252-3254,3257-3258,3260,3262,3264-3269,3274,3278-3281,3286-3288,3290-3291,3295-3298,3303-3304,3308-3309,3316-3317,3319,3327,3332-3333

LMDZ6/branches/DYNAMICO-conv/libf/phylmd/iophys.F90

r2793	r3356
95	95	IF (klon/=klon_omp) THEN
96	96	print*,'klon, klon_omp',klon,klon_omp
97		~~STOP'probleme de dimension parallele'~~
	97	CALL abort_physic('iophys_ecrit','probleme de dimension parallele',1)
98	98	ENDIF
99	99

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: